Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES on the android

This commit is contained in:
samuele3hu 2014-11-06 14:32:03 +08:00
parent 0402ed37f6
commit 76ab86674e
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cocos/scripting/lua-bindings/proj.android/Android.mk
View File

@ -1,4 +1,31 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := cocos2d_lua_android_static
LOCAL_MODULE_FILENAME := libluacocos2dandroid
LOCAL_SRC_FILES := ../manual/platform/android/CCLuaJavaBridge.cpp \
../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../.. \
$(LOCAL_PATH)/../manual \
$(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../manual/platform/android \
$(LOCAL_PATH)/../manual/platform/android/jni
LOCAL_EXPORT_LDLIBS := -lGLESv2 \
-llog \
-lz \
-landroid
LOCAL_STATIC_LIBRARIES := luajit_static
include $(BUILD_STATIC_LIBRARY)
#==============================================================
include $(CLEAR_VARS)
LOCAL_MODULE := cocos2d_lua_static
@ -20,8 +47,6 @@ LOCAL_SRC_FILES := ../manual/CCLuaBridge.cpp \
../manual/cocos2d/lua_cocos2dx_physics_manual.cpp \
../manual/cocos2d/LuaOpengl.cpp \
../manual/cocos2d/LuaScriptHandlerMgr.cpp \
../manual/platform/android/CCLuaJavaBridge.cpp \
../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \
../manual/tolua_fix.cpp \
../../../../external/lua/tolua/tolua_event.c \
../../../../external/lua/tolua/tolua_is.c \
@ -117,15 +142,11 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../manual/cocosbuilder \
$(LOCAL_PATH)/../manual/spine \
$(LOCAL_PATH)/../manual/ui \
$(LOCAL_PATH)/../manual/platform/android \
$(LOCAL_PATH)/../manual/platform/android/jni \
$(LOCAL_PATH)/../../../../external/xxtea \
$(LOCAL_PATH)/../../../.. \
$(LOCAL_PATH)/../../../../external/lua \
$(LOCAL_PATH)/../../../../external/lua/quick
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/luajit/include \
$(LOCAL_PATH)/../auto \
@ -143,12 +164,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/quick \
$(LOCAL_PATH)/../../../..
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_android_static
LOCAL_STATIC_LIBRARIES := luajit_static
LOCAL_STATIC_LIBRARIES += cocos2dx_static
LOCAL_STATIC_LIBRARIES := cocos2dx_static
include $(BUILD_STATIC_LIBRARY)
$(call import-module,lua/luajit/prebuilt/android)
$(call import-module,.)