diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-08-24 12:54:01 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-08-24 16:54:20 +0200 |
| commit | a40266822068c89910567a91801247a24b08a46c (patch) | |
| tree | 989407e63a7493fb03bc8110af426bf29c8bd967 /android-configure.sh | |
| parent | 816e53ca385b64c18c9c7cfca569c4d747634e97 (diff) | |
| download | external_qemu-a40266822068c89910567a91801247a24b08a46c.zip external_qemu-a40266822068c89910567a91801247a24b08a46c.tar.gz external_qemu-a40266822068c89910567a91801247a24b08a46c.tar.bz2 | |
Avoid conflicts with SDL_CONFIG variable.
Other Android.mk parsed before this one may define SDL_CONFIG
in an unexpected way. We only use this variable as input when
want to implement the --sdl-config option in ./android-configure.sh
Use QEMU_SDL_CONFIG instead to avoid issues.
Change-Id: I89d56284017c696227d7c66ea7d7b0acaa73a9ca
Diffstat (limited to 'android-configure.sh')
| -rwxr-xr-x | android-configure.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |