diff options
| author | Al Sutton <al@funkyandroid.com> | 2011-12-21 13:16:22 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-12-21 13:17:18 -0800 |
| commit | c3c9c6f72fe60762874f4591ba0352b614e34d14 (patch) | |
| tree | e564f7ea81a527f24633dc587e43de53f4302292 /Makefile.android | |
| parent | 85937739d4fe5e06349a0bfff22365f04dc39a98 (diff) | |
| download | external_qemu-c3c9c6f72fe60762874f4591ba0352b614e34d14.zip external_qemu-c3c9c6f72fe60762874f4591ba0352b614e34d14.tar.gz external_qemu-c3c9c6f72fe60762874f4591ba0352b614e34d14.tar.bz2 | |
Fix build on MacOS 10.7 / XCode 4
Force the inclusion of the dynamic linker libraries used by the
prebuilt libSDL. I did look at turning the switch on to build libSDL
from source, but libSDL-1.2 isn't buildable under 10.7/XCode 4,
and they've moved on to 1.3 now, so that would have been a dead end;
Change-Id: Idf75bb46e855929543395811d4d56e1f7dfa3785
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.android b/Makefile.android index 0d53f42..d638640 100644 --- a/Makefile.android +++ b/Makefile.android @@ -191,6 +191,11 @@ endif ifeq ($(HOST_OS),darwin) QEMU_SYSTEM_LDLIBS += -Wl,-framework,Cocoa,-framework,QTKit,-framework,CoreVideo + 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 + QEMU_SYSTEM_LDLIBS += /usr/lib/dylib1.o + endif endif include $(LOCAL_PATH)/Makefile.common |