diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-07-21 16:32:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-21 16:32:32 +0000 |
| commit | a268ba5f6bbbc67904124f7368f617dbb3fae6ef (patch) | |
| tree | 889f16f76567054ea5fc085f274ceade0a09bd81 /emulator/opengl/shared/OpenglCodecCommon/Android.mk | |
| parent | 4af45028b6b9761038a83a445d6d21137e8be2ef (diff) | |
| parent | c245592b0d472437ade15a22076c2193441f0eea (diff) | |
| download | sdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.zip sdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.tar.gz sdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.tar.bz2 | |
am c245592b: Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133 automerge: 4e42336
* commit 'c245592b0d472437ade15a22076c2193441f0eea':
emulator/opengl: Remove out-of-process handling code.
emulator/opengl: refactor Thread class.
emulator/opengl: refactor shared library handling.
Diffstat (limited to 'emulator/opengl/shared/OpenglCodecCommon/Android.mk')
| -rw-r--r-- | emulator/opengl/shared/OpenglCodecCommon/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/emulator/opengl/shared/OpenglCodecCommon/Android.mk b/emulator/opengl/shared/OpenglCodecCommon/Android.mk index 83090d8..0c3f827 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/Android.mk +++ b/emulator/opengl/shared/OpenglCodecCommon/Android.mk @@ -13,8 +13,11 @@ commonSources := \ host_commonSources := $(commonSources) +host_commonLdLibs := -lstdc++ + ifeq ($(HOST_OS),windows) host_commonSources += Win32PipeStream.cpp + host_commonLdLibs += -lws2_32 -lpsapi else host_commonSources += UnixStream.cpp endif @@ -26,7 +29,7 @@ $(call emugl-begin-host-static-library,libOpenglCodecCommon) LOCAL_SRC_FILES := $(host_commonSources) $(call emugl-import, libemugl_common) $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include/libOpenglRender $(LOCAL_PATH)) -$(call emugl-export,LDLIBS,-lstdc++) +$(call emugl-export,LDLIBS,$(host_commonLdLibs)) $(call emugl-end-module) @@ -39,6 +42,6 @@ ifdef EMUGL_BUILD_64BITS $(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-export,LDLIBS,$(host_commonLdLibs)) $(call emugl-end-module) endif |