LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mac build

Browse Source 
Change-Id: Ic0ada31663beadbff06ac18ca4c5960c869b0ec8
This commit is contained in:
David Turner
2011-04-16 19:23:56 +02:00
parent 218ccb4d46
commit 427cb6c3b0
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/emulator/opengl/shared/OpenglOsUtils/Android.mk
View File

@@ -18,27 +18,21 @@ include $(BUILD_STATIC_LIBRARY)
### OpenglOsUtils host ############################################## ### OpenglOsUtils host ##############################################
include $(CLEAR_VARS) include $(CLEAR_VARS)
ifeq ($(HOST_OS),linux) ifneq ($(HOST_OS),windows)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
osProcessUnix.cpp \ osProcessUnix.cpp \
osThreadUnix.cpp \ osThreadUnix.cpp \
osDynLibrary.cpp osDynLibrary.cpp
else # !linux else # windows
ifeq ($(HOST_OS),windows)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
osProcessWin.cpp \ osProcessWin.cpp \
osThreadWin.cpp \ osThreadWin.cpp \
osDynLibrary.cpp osDynLibrary.cpp
else # !windows
LOCAL_SRC_FILES :=
endif # windows endif # windows
endif # linux
ifneq (,$(LOCAL_SRC_FILES)) # do not build if host platform not supported ifneq (,$(LOCAL_SRC_FILES)) # do not build if host platform not supported

6
tools/emulator/opengl/shared/OpenglOsUtils/osProcess.h
View File

@@ -18,8 +18,6 @@
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#elif !defined(__linux__)
#error "Unsupported platform"
#endif #endif
namespace osUtils { namespace osUtils {
@@ -34,7 +32,7 @@ public:
{ {
#ifdef _WIN32 #ifdef _WIN32
return m_proc.dwProcessId; return m_proc.dwProcessId;
#elif defined(__linux__) #else
return(m_pid); return(m_pid);
#endif #endif
} }
@@ -48,7 +46,7 @@ private:
private: private:
#ifdef _WIN32 #ifdef _WIN32
PROCESS_INFORMATION m_proc; PROCESS_INFORMATION m_proc;
#elif defined(__linux__) #else
int m_pid; int m_pid;
#endif #endif
}; };