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

Fix build on MacOS 10.7 / XCode 4

Browse Source 
Ensure the dynamic library library gets linked in with SDL
to fix compilation errors

Change-Id: I32e6929088eaf73d707e89d10392c658b58ec465
This commit is contained in:
Al Sutton
2011-12-21 13:20:58 -08:00
committed by Jean-Baptiste Queru
parent 5192264cf4
commit 87879839f1
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk
View File

@@ -8,6 +8,15 @@ LOCAL_SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config
LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags) LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags)
LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs)) 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.%,$(DARWIN_VERSION)),)
# Lion 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
endif
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
triangleCM.cpp triangleCM.cpp

6
tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk
View File

@@ -17,6 +17,12 @@ LOCAL_LDLIBS += $(LOCAL_SDL_LDLIBS)
LOCAL_STATIC_LIBRARIES += libSDL libSDLmain LOCAL_STATIC_LIBRARIES += libSDL libSDLmain
ifeq ($(HOST_OS),darwin) 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
# 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 endif