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

Merge "Really fix the Mac build."

Browse Source
This commit is contained in:
David Turner
2011-04-16 13:25:48 -07:00
committed by Android Code Review
parent 34f083b1f3 eff952cdbf
commit 9e9b85c3f6
5 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/emulator/opengl/host/include/libOpenglRender/render_api.h
View File

@@ -32,7 +32,7 @@ typedef HWND FBNativeWindowType;
typedef Window FBNativeWindowType; typedef Window FBNativeWindowType;
#else #else
#error "Unsupported platform" #warning "Unsupported platform"
#endif #endif

3
tools/emulator/opengl/host/libs/libOpenglRender/Android.mk
View File

@@ -1,5 +1,6 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
ifneq ($(HOST_OS),darwin)
### libOpenglRender ################################################# ### libOpenglRender #################################################
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -63,3 +64,5 @@ endif
#LOCAL_CFLAGS := -O0 -g #LOCAL_CFLAGS := -O0 -g
include $(BUILD_HOST_SHARED_LIBRARY) include $(BUILD_HOST_SHARED_LIBRARY)
endif # HOST_OS != darwin

2
tools/emulator/opengl/host/libs/libOpenglRender/FrameBuffer.h
View File

@@ -27,7 +27,7 @@
#if defined(__linux__) || defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) #if defined(__linux__) || defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__)
#else #else
#error "Unsupported Platform" #warning "Unsupported Platform"
#endif #endif
typedef uint32_t HandleType; typedef uint32_t HandleType;

3
tools/emulator/opengl/host/renderer/Android.mk
View File

@@ -1,5 +1,7 @@
LOCAL_PATH:=$(call my-dir) LOCAL_PATH:=$(call my-dir)
# OS X not supported for now
ifneq ($(HOST_OS),darwin)
# host renderer process ########################### # host renderer process ###########################
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -24,3 +26,4 @@ LOCAL_SHARED_LIBRARIES := libOpenglRender \
lib_renderControl_dec lib_renderControl_dec
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
endif # HOST_OS != darwin

3
tools/emulator/opengl/tests/emulator_test_renderer/Android.mk
View File

@@ -1,5 +1,7 @@
LOCAL_PATH:=$(call my-dir) LOCAL_PATH:=$(call my-dir)
# For now, OS X is not supported
ifneq ($(HOST_OS),darwin)
# test opengl renderer driver ########################### # test opengl renderer driver ###########################
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -31,3 +33,4 @@ LOCAL_SHARED_LIBRARIES := libOpenglRender \
LOCAL_STATIC_LIBRARIES += libSDL libSDLmain LOCAL_STATIC_LIBRARIES += libSDL libSDLmain
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
endif # HOST_OS != darwin