diff options
| author | Jesse Hall <jessehall@google.com> | 2012-07-17 17:01:04 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-23 14:51:03 -0700 |
| commit | c60b11434975c424e937fad75275840ef5ec3e81 (patch) | |
| tree | 4b74a18db9a5b6ce622cf40610c103c2c7388a13 /Makefile.common | |
| parent | a42f5af0f706d7c7fc8e6527c905c79b5298058e (diff) | |
| download | external_qemu-c60b11434975c424e937fad75275840ef5ec3e81.zip external_qemu-c60b11434975c424e937fad75275840ef5ec3e81.tar.gz external_qemu-c60b11434975c424e937fad75275840ef5ec3e81.tar.bz2 | |
Switch to sdl 1.2.15 and build from source on osx
Change-Id: I036eefd9789bfe346e9ee5acc15c1d9ffe995c94
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Makefile.common b/Makefile.common index 4382bd2..51fcb85 100644 --- a/Makefile.common +++ b/Makefile.common @@ -198,14 +198,6 @@ ifeq ($(QEMU_HOST_TAG),linux-x86) BUILD_SDL_FROM_SOURCES := false endif -# On darwin-x86, a bug in the Android build system prevents the compilation -# of Objective-C sources. Fixed recently in AOSP, but we still use the -# prebuilts for the benefit of older platform branches. -# -ifeq ($(QEMU_HOST_TAG),darwin-x86) - BUILD_SDL_FROM_SOURCES := false -endif - # If we're building with android-configure.sh && make, always build from # sources to catch regressions as soon as they happen. # @@ -238,7 +230,7 @@ ifneq ($(BUILD_SDL_FROM_SOURCES),true) else # BUILD_SDL_FROM_SOURCES - SDL_DIR := distrib/sdl-1.2.12 + SDL_DIR := distrib/sdl-1.2.15 include $(LOCAL_PATH)/$(SDL_DIR)/sources.make common_LOCAL_SRC_FILES += $(SDL_SOURCES) |