diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-03-01 12:21:39 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-03-11 18:03:08 +0100 |
| commit | 56b89bc863d1a5da6234f05923f63b5466e1ce3f (patch) | |
| tree | 4204ae9b54bec017c7d8e2e9688ba1120b6af89a /emulator/opengl/tests | |
| parent | 829f46fdcd3136e2b97c310538cb27881ff3733b (diff) | |
| download | sdk-56b89bc863d1a5da6234f05923f63b5466e1ce3f.zip sdk-56b89bc863d1a5da6234f05923f63b5466e1ce3f.tar.gz sdk-56b89bc863d1a5da6234f05923f63b5466e1ce3f.tar.bz2 | |
emulator/opengl: Allow standalone build.
This patch improves the build files for the GPU emulation
libraries to allow them to be built directly with the emulator's
own standalone build system.
Change-Id: I205392bdfe4223a5c43fa67e24a2beffcbcbc07a
Diffstat (limited to 'emulator/opengl/tests')
| -rw-r--r-- | emulator/opengl/tests/translator_tests/GLES_CM/Android.mk | 6 | ||||
| -rw-r--r-- | emulator/opengl/tests/translator_tests/GLES_V2/Android.mk | 5 | ||||
| -rw-r--r-- | emulator/opengl/tests/ut_renderer/Android.mk | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk b/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk index d14d369..1f25a33 100644 --- a/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk +++ b/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk @@ -9,7 +9,7 @@ ifeq ($(HOST_OS),darwin) OSX_VERSION_MAJOR := $(shell echo $(mac_sdk_version) | cut -d . -f 2) OSX_VERSION_MAJOR_GREATER_THAN_OR_EQUAL_TO_6 := $(shell [ $(OSX_VERSION_MAJOR) -ge 6 ] && echo true) ifeq ($(OSX_VERSION_MAJOR_GREATER_THAN_OR_EQUAL_TO_6),true) - LOCAL_SDL_LDLIBS += -Wl,-undefined,dynamic_lookup + LOCAL_LDLIBS += -Wl,-undefined,dynamic_lookup endif endif @@ -17,9 +17,9 @@ LOCAL_SRC_FILES:= \ triangleCM.cpp LOCAL_CFLAGS += $(EMUGL_SDL_CFLAGS) -g -O0 -LOCAL_LDLIBS += $(EMUGL_SDL_LDLIBS) +LOCAL_LDLIBS += $(EMUGL_SDL_LDLIBS) -lstdc++ -LOCAL_STATIC_LIBRARIES += libSDL libSDLmain +LOCAL_STATIC_LIBRARIES += $(EMUGL_SDL_STATIC_LIBRARIES) ifeq ($(HOST_OS),darwin) $(call emugl-import,libMac_view) diff --git a/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk b/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk index 98f85a3..10b3b0c 100644 --- a/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk +++ b/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk @@ -7,9 +7,9 @@ LOCAL_SRC_FILES:= \ triangleV2.cpp LOCAL_CFLAGS += $(EMUGL_SDL_CFLAGS) -g -O0 -LOCAL_LDLIBS += $(EMUGL_SDL_LDLIBS) +LOCAL_LDLIBS += $(EMUGL_SDL_LDLIBS) -lstdc++ -LOCAL_STATIC_LIBRARIES += libSDL libSDLmain +LOCAL_STATIC_LIBRARIES += $(EMUGL_SDL_STATIC_LIBRARIES) ifeq ($(HOST_OS),darwin) # SDK 10.6+ deprecates __dyld_func_lookup required by dlcompat_init_func @@ -23,4 +23,3 @@ ifeq ($(HOST_OS),darwin) endif $(call emugl-end-module) - diff --git a/emulator/opengl/tests/ut_renderer/Android.mk b/emulator/opengl/tests/ut_renderer/Android.mk index fe8e7ac..91608b2 100644 --- a/emulator/opengl/tests/ut_renderer/Android.mk +++ b/emulator/opengl/tests/ut_renderer/Android.mk @@ -3,7 +3,7 @@ LOCAL_PATH:=$(call my-dir) ifeq ($(HOST_OS), linux) $(call emugl-begin-host-executable,ut_renderer) -$(call emugl-import,libut_rendercontrol_dec libGLESv1_dec libGLESv2_dec libEGL_host_wrapper) +$(call emugl-import,libut_rendercontrol_dec libGLESv1_dec libGLESv2_dec libEGL_host_wrapper libOpenglRender) LOCAL_SRC_FILES := ut_renderer.cpp \ RenderingThread.cpp \ |