diff --git a/tools/emulator/opengl/shared/OpenglOsUtils/Android.mk b/tools/emulator/opengl/shared/OpenglOsUtils/Android.mk index 7ca6ed84d..5d350f121 100644 --- a/tools/emulator/opengl/shared/OpenglOsUtils/Android.mk +++ b/tools/emulator/opengl/shared/OpenglOsUtils/Android.mk @@ -18,27 +18,21 @@ include $(BUILD_STATIC_LIBRARY) ### OpenglOsUtils host ############################################## include $(CLEAR_VARS) -ifeq ($(HOST_OS),linux) +ifneq ($(HOST_OS),windows) LOCAL_SRC_FILES := \ osProcessUnix.cpp \ osThreadUnix.cpp \ osDynLibrary.cpp -else # !linux -ifeq ($(HOST_OS),windows) +else # windows LOCAL_SRC_FILES := \ osProcessWin.cpp \ osThreadWin.cpp \ osDynLibrary.cpp -else # !windows - - LOCAL_SRC_FILES := - endif # windows -endif # linux ifneq (,$(LOCAL_SRC_FILES)) # do not build if host platform not supported diff --git a/tools/emulator/opengl/shared/OpenglOsUtils/osProcess.h b/tools/emulator/opengl/shared/OpenglOsUtils/osProcess.h index 7fff7f707..82b31b33a 100644 --- a/tools/emulator/opengl/shared/OpenglOsUtils/osProcess.h +++ b/tools/emulator/opengl/shared/OpenglOsUtils/osProcess.h @@ -18,8 +18,6 @@ #ifdef _WIN32 #include -#elif !defined(__linux__) -#error "Unsupported platform" #endif namespace osUtils { @@ -34,7 +32,7 @@ public: { #ifdef _WIN32 return m_proc.dwProcessId; -#elif defined(__linux__) +#else return(m_pid); #endif } @@ -48,7 +46,7 @@ private: private: #ifdef _WIN32 PROCESS_INFORMATION m_proc; -#elif defined(__linux__) +#else int m_pid; #endif };