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/shared/OpenglCodecCommon | |
| 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/shared/OpenglCodecCommon')
| -rw-r--r-- | emulator/opengl/shared/OpenglCodecCommon/Android.mk | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/emulator/opengl/shared/OpenglCodecCommon/Android.mk b/emulator/opengl/shared/OpenglCodecCommon/Android.mk index f285f6a..b6a7e07 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/Android.mk +++ b/emulator/opengl/shared/OpenglCodecCommon/Android.mk @@ -24,17 +24,21 @@ endif $(call emugl-begin-host-static-library,libOpenglCodecCommon) LOCAL_SRC_FILES := $(host_commonSources) - -$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) +$(call emugl-import, libemugl_common) +$(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include/libOpenglRender $(LOCAL_PATH)) +$(call emugl-export,LDLIBS,-lstdc++) $(call emugl-end-module) ### OpenglCodecCommon host, 64-bit ######################################### -$(call emugl-begin-host-static-library,lib64OpenglCodecCommon) +ifdef EMUGL_BUILD_64BITS + $(call emugl-begin-host-static-library,lib64OpenglCodecCommon) -LOCAL_SRC_FILES := $(host_commonSources) - -$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) -$(call emugl-export,CFLAGS,-m64) -$(call emugl-end-module) + LOCAL_SRC_FILES := $(host_commonSources) + $(call emugl-import, lib64emugl_common) + $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include/libOpenglRender $(LOCAL_PATH)) + $(call emugl-export,CFLAGS,-m64 -fPIC) + $(call emugl-export,LDLIBS,-lstdc++) + $(call emugl-end-module) +endif |