diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-08-24 08:01:49 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-08-24 08:01:49 -0700 |
| commit | 139993449b895edfd94599ef9c975192dcce810d (patch) | |
| tree | 989407e63a7493fb03bc8110af426bf29c8bd967 | |
| parent | c49a1bf6de1980accfb93b5adb43c6754bd1f979 (diff) | |
| parent | a40266822068c89910567a91801247a24b08a46c (diff) | |
| download | external_qemu-139993449b895edfd94599ef9c975192dcce810d.zip external_qemu-139993449b895edfd94599ef9c975192dcce810d.tar.gz external_qemu-139993449b895edfd94599ef9c975192dcce810d.tar.bz2 | |
Merge "Avoid conflicts with SDL_CONFIG variable."
| -rw-r--r-- | Makefile.common | 3 | ||||
| -rwxr-xr-x | android-configure.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.common b/Makefile.common index 5d1aa6e..0b9f954 100644 --- a/Makefile.common +++ b/Makefile.common @@ -192,8 +192,9 @@ endif # Except if we used android-configure.sh --sdl-config=<script> # -ifneq ($(SDL_CONFIG),) +ifneq ($(QEMU_SDL_CONFIG),) BUILD_SDL_FROM_SOURCES := false + SDL_CONFIG := $(QEMU_SDL_CONFIG) endif ifneq ($(BUILD_SDL_FROM_SOURCES),true) diff --git a/android-configure.sh b/android-configure.sh index 4939323..7f8c79b 100755 --- a/android-configure.sh +++ b/android-configure.sh @@ -414,7 +414,7 @@ echo "PREBUILT := $ANDROID_PREBUILT" >> $config_mk PWD=`pwd` echo "SRC_PATH := $PWD" >> $config_mk if [ -n "$SDL_CONFIG" ] ; then -echo "SDL_CONFIG := $SDL_CONFIG" >> $config_mk +echo "QEMU_SDL_CONFIG := $SDL_CONFIG" >> $config_mk fi echo "CONFIG_COREAUDIO := $PROBE_COREAUDIO" >> $config_mk echo "CONFIG_WINAUDIO := $PROBE_WINAUDIO" >> $config_mk |