From a40266822068c89910567a91801247a24b08a46c Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@android.com>
Date: Wed, 24 Aug 2011 12:54:01 +0200
Subject: 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
---
 Makefile.common | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile.common')

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)
-- 
cgit v1.1