commit d8079c1ecc97504021115865af1e704d4414e2e6
author David 'Digit' Turner <digit@android.com> Wed Aug 24 08:16:59 2011 -0700
committer Android Code Review <code-review@android.com> Wed Aug 24 08:16:59 2011 -0700
tree 9c09345c466e1a1cfcb9a57c45725781b2a90443
parent d98b3782a72ca20bf83f15be2782df460503f592
parent e2dda380174cb0c866a01c1fe0c8c77775ebed83

Merge "emulator: opengl: Avoid conflicts with SDL_CONFIG"

tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk

diff --git a/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk b/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk
index a72b778..deb11b6 100644
--- a/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk
+++ b/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk
@@ -4,15 +4,15 @@
 $(call emugl-import,libEGL_translator libGLES_CM_translator)
 
 PREBUILT := $(HOST_PREBUILT_TAG)
-SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config
-SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
-SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(SDL_CONFIG) --static-libs))
+LOCAL_SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config
+LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags)
+LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs))
 
 LOCAL_SRC_FILES:= \
         triangleCM.cpp
 
-LOCAL_CFLAGS += $(SDL_CFLAGS) -g -O0
-LOCAL_LDLIBS += $(SDL_LDLIBS)
+LOCAL_CFLAGS += $(LOCAL_SDL_CFLAGS) -g -O0
+LOCAL_LDLIBS += $(LOCAL_SDL_LDLIBS)
 
 LOCAL_STATIC_LIBRARIES += libSDL libSDLmain
 

tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk

diff --git a/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk b/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk
index ddbf98e..ae0064f 100644
--- a/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk
+++ b/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk
@@ -4,15 +4,15 @@
 $(call emugl-import,libEGL_translator libGLES_V2_translator)
 
 PREBUILT := $(HOST_PREBUILT_TAG)
-SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config
-SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
-SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(SDL_CONFIG) --static-libs))
+LOCAL_SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config
+LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags)
+LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs))
 
 LOCAL_SRC_FILES:= \
         triangleV2.cpp
 
-LOCAL_CFLAGS += $(SDL_CFLAGS) -g -O0
-LOCAL_LDLIBS += $(SDL_LDLIBS)
+LOCAL_CFLAGS += $(LOCAL_SDL_CFLAGS) -g -O0
+LOCAL_LDLIBS += $(LOCAL_SDL_LDLIBS)
 
 LOCAL_STATIC_LIBRARIES += libSDL libSDLmain