diff options
Diffstat (limited to 'emulator/opengl/host/libs/libOpenglRender/Android.mk')
| -rw-r--r-- | emulator/opengl/host/libs/libOpenglRender/Android.mk | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/emulator/opengl/host/libs/libOpenglRender/Android.mk b/emulator/opengl/host/libs/libOpenglRender/Android.mk index ca5a08a..20567f0 100644 --- a/emulator/opengl/host/libs/libOpenglRender/Android.mk +++ b/emulator/opengl/host/libs/libOpenglRender/Android.mk @@ -62,24 +62,21 @@ $(call emugl-end-module) ### host libOpenglRender, 64-bit ######################################### -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-shared-library,lib64OpenglRender) +$(call emugl-begin-host64-shared-library,lib64OpenglRender) - $(call emugl-import,lib64GLESv1_dec lib64GLESv2_dec lib64_renderControl_dec lib64OpenglCodecCommon) +$(call emugl-import,lib64GLESv1_dec lib64GLESv2_dec lib64_renderControl_dec lib64OpenglCodecCommon) - #LOCAL_LDFLAGS += -m64 # adding -m64 here doesn't work, because it somehow appear BEFORE -m32 in command-line. - LOCAL_LDLIBS += $(host_common_LDLIBS) -m64 # Put -m64 it in LOCAL_LDLIBS instead. +LOCAL_LDLIBS += $(host_common_LDLIBS) - LOCAL_SRC_FILES := $(host_common_SRC_FILES) - $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include) - $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) +LOCAL_SRC_FILES := $(host_common_SRC_FILES) +$(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include) +$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) - # use Translator's egl/gles headers - LOCAL_C_INCLUDES += $(EMUGL_PATH)/host/libs/Translator/include +# use Translator's egl/gles headers +LOCAL_C_INCLUDES += $(EMUGL_PATH)/host/libs/Translator/include - LOCAL_STATIC_LIBRARIES += lib64emugl_common +LOCAL_STATIC_LIBRARIES += lib64emugl_common - $(call emugl-export,CFLAGS,$(host_common_CFLAGS) -m64) +$(call emugl-export,CFLAGS,$(host_common_CFLAGS)) - $(call emugl-end-module) -endif
\ No newline at end of file +$(call emugl-end-module) |