diff options
| author | Al Sutton <al@funkyandroid.com> | 2012-05-07 10:01:44 +0100 |
|---|---|---|
| committer | Al Sutton <al@funkyandroid.com> | 2012-05-07 10:01:44 +0100 |
| commit | de5cb35fc8117d923981a988792f956b812c84d5 (patch) | |
| tree | 11a514caf630fd27c1645d3b24d80d46b63d341a /emulator/opengl/tests | |
| parent | 443bced59c3b18ab297372c7dce4f394a4e95eb9 (diff) | |
| download | sdk-de5cb35fc8117d923981a988792f956b812c84d5.zip sdk-de5cb35fc8117d923981a988792f956b812c84d5.tar.gz sdk-de5cb35fc8117d923981a988792f956b812c84d5.tar.bz2 | |
Use the same compilation options on OS X 10.8 as 10.7
Added OS X 10.8 to the conditional which includes dylib during compilation
on 10.7.
Change-Id: Id078e001fd52d82b345249fcf647e0a4802c1f89
Signed-off-by: Al Sutton <al@funkyandroid.com>
Diffstat (limited to 'emulator/opengl/tests')
| -rw-r--r-- | emulator/opengl/tests/translator_tests/GLES_CM/Android.mk | 4 | ||||
| -rw-r--r-- | emulator/opengl/tests/translator_tests/GLES_V2/Android.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk b/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk index 77cd272..d47d340 100644 --- a/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk +++ b/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk @@ -10,8 +10,8 @@ LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static- ifeq ($(HOST_OS),darwin) DARWIN_VERSION := $(strip $(shell sw_vers -productVersion)) - ifneq ($(filter 10.7 10.7.%,$(DARWIN_VERSION)),) - # Lion needs to be forced to link dylib to avoid problems + 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 diff --git a/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk b/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk index 53f774c..2371da7 100644 --- a/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk +++ b/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk @@ -18,8 +18,8 @@ LOCAL_STATIC_LIBRARIES += libSDL libSDLmain ifeq ($(HOST_OS),darwin) DARWIN_VERSION := $(strip $(shell sw_vers -productVersion)) -ifneq ($(filter 10.7 10.7.%,$(DARWIN_VERSION)),) - # Lion needs to be forced to link dylib to avoid problems +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_LDLIBS += /usr/lib/dylib1.o endif |