aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.common3
-rwxr-xr-xandroid-configure.sh2
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