diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-06-04 16:07:01 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-06-08 17:43:17 +0200 |
| commit | 46be48730333120a7b939116cef075e61c12c703 (patch) | |
| tree | 92bde033dd93fc14e0e2565a52293b59787b8859 /Makefile.android | |
| parent | b72269abe4a75736c09b0ee8797b736f49c058c8 (diff) | |
| download | external_qemu-46be48730333120a7b939116cef075e61c12c703.zip external_qemu-46be48730333120a7b939116cef075e61c12c703.tar.gz external_qemu-46be48730333120a7b939116cef075e61c12c703.tar.bz2 | |
Add our modified SDL sources under distrib/sdl-1.2.12
Fix distrib/make-distrib.sh script to work with git
Fix distrib/build-emulator.sh to accomodate for new SDL configure script
Handle Tiger SDK usage in SDL configure script
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Makefile.android b/Makefile.android index 42f04ac..5330959 100644 --- a/Makefile.android +++ b/Makefile.android @@ -308,6 +308,12 @@ ifeq ($(BUILD_QEMU_AUDIO_LIB),true) -I$(LOCAL_PATH)/target-arm \ -I$(LOCAL_PATH)/fpu \ + # this is very important, otherwise the generated binaries may + # not link properly on our build servers + ifeq ($(HOST_OS),linux) + LOCAL_CFLAGS += -fno-stack-protector + endif + LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) $(AUDIO_CFLAGS) LOCAL_CFLAGS += $(SDL_CFLAGS) @@ -456,7 +462,6 @@ VL_SOURCES := vl.c osdep.c cutils.c \ android/utils/bufprint.c \ android/utils/debug.c \ android/utils/dirscanner.c \ - android/utils/display.c \ android/utils/ini.c \ android/utils/filelock.c \ android/utils/misc.c \ @@ -469,17 +474,6 @@ VL_SOURCES := vl.c osdep.c cutils.c \ android/avd/hw-config.c \ android/avd/info.c \ -# we need to add a Quartz-specific file -ifeq ($(HOST_OS),darwin) - # Alas, the Android build system doesn't know how to deal - # with Objective C sources yet. - ifeq ($(BUILD_STANDALONE_EMULATOR),true) - VL_SOURCES += android/utils/display-quartz.m - else - LOCAL_CFLAGS += -DCONFIG_NO_COCOA - endif -endif - VL_SOURCES += hw/arm_boot.c \ hw/android_arm.c \ |