diff options
| author | Ying Wang <wangying@google.com> | 2012-05-30 19:16:13 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-05-31 15:20:56 -0700 |
| commit | 66517fefcce94a3035390b234720b4aad67df1f3 (patch) | |
| tree | 2dcbeb95b312e5ba0f07ae1d39444be77478035c /emulator/opengl/tests | |
| parent | 6b0a56859a50f24bf7d9e53626f066b031d68862 (diff) | |
| download | sdk-66517fefcce94a3035390b234720b4aad67df1f3.zip sdk-66517fefcce94a3035390b234720b4aad67df1f3.tar.gz sdk-66517fefcce94a3035390b234720b4aad67df1f3.tar.bz2 | |
Mac 10.6 needs /usr/lib/dylib1.o too.
Now Mac OS X SDK 10.6 is the minimal requirement.
Change-Id: Ic4ad91210048120965f13957376c5c581567cda4
Diffstat (limited to 'emulator/opengl/tests')
| -rw-r--r-- | emulator/opengl/tests/translator_tests/GLES_CM/Android.mk | 9 | ||||
| -rw-r--r-- | emulator/opengl/tests/translator_tests/GLES_V2/Android.mk | 7 |
2 files changed, 5 insertions, 11 deletions
diff --git a/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk b/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk index d47d340..bce56e3 100644 --- a/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk +++ b/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk @@ -9,12 +9,9 @@ LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags) LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs)) ifeq ($(HOST_OS),darwin) - DARWIN_VERSION := $(strip $(shell sw_vers -productVersion)) - ifneq ($(filter 10.7 10.7.% 10.8 10.8.%,$(DARWIN_VERSION)),) - # OS X 10.7+ needs to be forced to link dylib to avoid problems - # with the dynamic function lookups in SDL 1.2 - LOCAL_SDL_LDLIBS += /usr/lib/dylib1.o - endif + # OS X 10.6+ needs to be forced to link dylib to avoid problems + # with the dynamic function lookups in SDL 1.2 + LOCAL_SDL_LDLIBS += /usr/lib/dylib1.o endif LOCAL_SRC_FILES:= \ diff --git a/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk b/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk index 2371da7..504530f 100644 --- a/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk +++ b/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk @@ -17,13 +17,10 @@ LOCAL_LDLIBS += $(LOCAL_SDL_LDLIBS) LOCAL_STATIC_LIBRARIES += libSDL libSDLmain ifeq ($(HOST_OS),darwin) -DARWIN_VERSION := $(strip $(shell sw_vers -productVersion)) -ifneq ($(filter 10.7 10.7.% 10.8 10.8.%,$(DARWIN_VERSION)),) - # OS X 10.7+ needs to be forced to link dylib to avoid problems + # OS X 10.6+ needs to be forced to link dylib to avoid problems # with the dynamic function lookups in SDL 1.2 LOCAL_LDLIBS += /usr/lib/dylib1.o -endif -$(call emugl-import,libMac_view) + $(call emugl-import,libMac_view) endif $(call emugl-end-module) |