diff options
| author | David 'Digit' Turner <digit@android.com> | 2014-01-13 21:49:00 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-01-18 16:56:37 +0100 |
| commit | 2cab9c9e9b9e8075b27ee466fc01e34392b9380b (patch) | |
| tree | 174247dc16659e523d04406e00949e5a825132b4 /emulator/opengl/tests | |
| parent | b81cc7bbd7baa35042af6c6b71edcfe94004bbcd (diff) | |
| download | sdk-2cab9c9e9b9e8075b27ee466fc01e34392b9380b.zip sdk-2cab9c9e9b9e8075b27ee466fc01e34392b9380b.tar.gz sdk-2cab9c9e9b9e8075b27ee466fc01e34392b9380b.tar.bz2 | |
emulator/opengl: Prepare out-of-platform build with SDL.
A small patch to prepare for the out-of-platform-tree build.
This ones places SDL-related definitions in a new build file
(sdl.mk) and provide a way for the emulator's build system
to provide its own SDL compiler and linker flags.
+ Add missing KHR/khrplatform.h file.
Change-Id: I496f1a49730ffbfae80a074e09611bd07777cf1a
Diffstat (limited to 'emulator/opengl/tests')
3 files changed, 6 insertions, 25 deletions
diff --git a/emulator/opengl/tests/emulator_test_renderer/Android.mk b/emulator/opengl/tests/emulator_test_renderer/Android.mk index 9c4cfdd..d585513 100644 --- a/emulator/opengl/tests/emulator_test_renderer/Android.mk +++ b/emulator/opengl/tests/emulator_test_renderer/Android.mk @@ -5,17 +5,8 @@ $(call emugl-import,libOpenglRender event_injector) LOCAL_SRC_FILES := main.cpp -PREBUILT := $(HOST_PREBUILT_TAG) -LOCAL_SDL_CONFIG ?= prebuilts/tools/$(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_CFLAGS += $(LOCAL_SDL_CFLAGS) -g -O0 -LOCAL_LDLIBS += $(LOCAL_SDL_LDLIBS) - -ifeq ($(HOST_OS),windows) -LOCAL_LDLIBS += -lws2_32 -endif +LOCAL_CFLAGS += $(EMUGL_SDL_CFLAGS) -g -O0 +LOCAL_LDLIBS += $(EMUGL_SDL_LDLIBS) LOCAL_STATIC_LIBRARIES += libSDL libSDLmain diff --git a/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk b/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk index a66207e..d14d369 100644 --- a/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk +++ b/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk @@ -3,11 +3,6 @@ LOCAL_PATH:= $(call my-dir) $(call emugl-begin-host-executable,triangleCM) $(call emugl-import,libEGL_translator libGLES_CM_translator) -PREBUILT := $(HOST_PREBUILT_TAG) -LOCAL_SDL_CONFIG ?= prebuilts/tools/$(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)) - ifeq ($(HOST_OS),darwin) # SDK 10.6+ deprecates __dyld_func_lookup required by dlcompat_init_func # in SDL_dlcompat.o this module depends. Instruct linker to resolved it at runtime. @@ -21,8 +16,8 @@ endif LOCAL_SRC_FILES:= \ triangleCM.cpp -LOCAL_CFLAGS += $(LOCAL_SDL_CFLAGS) -g -O0 -LOCAL_LDLIBS += $(LOCAL_SDL_LDLIBS) +LOCAL_CFLAGS += $(EMUGL_SDL_CFLAGS) -g -O0 +LOCAL_LDLIBS += $(EMUGL_SDL_LDLIBS) LOCAL_STATIC_LIBRARIES += libSDL libSDLmain diff --git a/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk b/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk index e72da96..98f85a3 100644 --- a/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk +++ b/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk @@ -3,16 +3,11 @@ LOCAL_PATH:= $(call my-dir) $(call emugl-begin-host-executable,triangleV2) $(call emugl-import,libEGL_translator libGLES_V2_translator) -PREBUILT := $(HOST_PREBUILT_TAG) -LOCAL_SDL_CONFIG ?= prebuilts/tools/$(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 += $(LOCAL_SDL_CFLAGS) -g -O0 -LOCAL_LDLIBS += $(LOCAL_SDL_LDLIBS) +LOCAL_CFLAGS += $(EMUGL_SDL_CFLAGS) -g -O0 +LOCAL_LDLIBS += $(EMUGL_SDL_LDLIBS) LOCAL_STATIC_LIBRARIES += libSDL libSDLmain |