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 /Makefile.common | |
| 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 'Makefile.common')
| -rw-r--r-- | Makefile.common | 3 |
1 files changed, 2 insertions, 1 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) |