From eff952cdbfadce283f5aa8b0f20c6d389342a832 Mon Sep 17 00:00:00 2001
From: David Turner <digit@android.com>
Date: Sat, 16 Apr 2011 22:21:57 +0200
Subject: [PATCH] Really fix the Mac build.

Damned!

Change-Id: Ice8295fb23beefe328207112b011489276b5b278
---
 .../emulator/opengl/host/include/libOpenglRender/render_api.h  | 2 +-
 tools/emulator/opengl/host/libs/libOpenglRender/Android.mk     | 3 +++
 tools/emulator/opengl/host/libs/libOpenglRender/FrameBuffer.h  | 2 +-
 tools/emulator/opengl/host/renderer/Android.mk                 | 3 +++
 tools/emulator/opengl/tests/emulator_test_renderer/Android.mk  | 3 +++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/emulator/opengl/host/include/libOpenglRender/render_api.h b/tools/emulator/opengl/host/include/libOpenglRender/render_api.h
index c46f11d54..7ad1ae426 100644
--- a/tools/emulator/opengl/host/include/libOpenglRender/render_api.h
+++ b/tools/emulator/opengl/host/include/libOpenglRender/render_api.h
@@ -32,7 +32,7 @@ typedef HWND    FBNativeWindowType;
 typedef Window   FBNativeWindowType;
 
 #else
-#error "Unsupported platform"
+#warning "Unsupported platform"
 #endif
 
 
diff --git a/tools/emulator/opengl/host/libs/libOpenglRender/Android.mk b/tools/emulator/opengl/host/libs/libOpenglRender/Android.mk
index 7d60feee4..55894c58a 100644
--- a/tools/emulator/opengl/host/libs/libOpenglRender/Android.mk
+++ b/tools/emulator/opengl/host/libs/libOpenglRender/Android.mk
@@ -1,5 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
+ifneq ($(HOST_OS),darwin)
 ### libOpenglRender #################################################
 include $(CLEAR_VARS)
 
@@ -63,3 +64,5 @@ endif
 #LOCAL_CFLAGS := -O0 -g
 
 include $(BUILD_HOST_SHARED_LIBRARY)
+endif # HOST_OS != darwin
+
diff --git a/tools/emulator/opengl/host/libs/libOpenglRender/FrameBuffer.h b/tools/emulator/opengl/host/libs/libOpenglRender/FrameBuffer.h
index f1ae0d3b0..e30fba83a 100644
--- a/tools/emulator/opengl/host/libs/libOpenglRender/FrameBuffer.h
+++ b/tools/emulator/opengl/host/libs/libOpenglRender/FrameBuffer.h
@@ -27,7 +27,7 @@
 
 #if defined(__linux__) || defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__)
 #else
-#error "Unsupported Platform"
+#warning "Unsupported Platform"
 #endif
 
 typedef uint32_t HandleType;
diff --git a/tools/emulator/opengl/host/renderer/Android.mk b/tools/emulator/opengl/host/renderer/Android.mk
index 1b9f60b18..6f26548ec 100644
--- a/tools/emulator/opengl/host/renderer/Android.mk
+++ b/tools/emulator/opengl/host/renderer/Android.mk
@@ -1,5 +1,7 @@
 LOCAL_PATH:=$(call my-dir)
 
+# OS X not supported for now
+ifneq ($(HOST_OS),darwin)
 # host renderer process ###########################
 include $(CLEAR_VARS)
 
@@ -24,3 +26,4 @@ LOCAL_SHARED_LIBRARIES := libOpenglRender \
         lib_renderControl_dec
 
 include $(BUILD_HOST_EXECUTABLE)
+endif # HOST_OS != darwin
diff --git a/tools/emulator/opengl/tests/emulator_test_renderer/Android.mk b/tools/emulator/opengl/tests/emulator_test_renderer/Android.mk
index 307dd9a0b..d0b908615 100644
--- a/tools/emulator/opengl/tests/emulator_test_renderer/Android.mk
+++ b/tools/emulator/opengl/tests/emulator_test_renderer/Android.mk
@@ -1,5 +1,7 @@
 LOCAL_PATH:=$(call my-dir)
 
+# For now, OS X is not supported
+ifneq ($(HOST_OS),darwin)
 # test opengl renderer driver ###########################
 include $(CLEAR_VARS)
 
@@ -31,3 +33,4 @@ LOCAL_SHARED_LIBRARIES := libOpenglRender \
 LOCAL_STATIC_LIBRARIES += libSDL libSDLmain
 
 include $(BUILD_HOST_EXECUTABLE)
+endif # HOST_OS != darwin