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

Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the android platform

This commit is contained in:
samuele3hu 2014-08-25 09:48:14 +08:00
parent d1b4d43a0b
commit 25aab05b1f
3 changed files with 67 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,85 +30,16 @@ LOCAL_SRC_FILES := ../manual/CCLuaBridge.cpp \
../../../../external/lua/tolua/tolua_to.c \
../../../../external/xxtea/xxtea.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/luajit/include \
$(LOCAL_PATH)/../../../2d \
$(LOCAL_PATH)/../../../3d \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual \
$(LOCAL_PATH)/../manual/extension \
$(LOCAL_PATH)/../manual/cocostudio \
$(LOCAL_PATH)/../manual/ui \
$(LOCAL_PATH)/../manual/cocos2d \
$(LOCAL_PATH)/../manual/platform/android \
$(LOCAL_PATH)/../manual/platform/android/jni \
$(LOCAL_PATH)/../../../../external/xxtea \
$(LOCAL_PATH)/../../../.. \
$(LOCAL_PATH)/../../../../extensions
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/luajit/include \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual \
$(LOCAL_PATH)/../manual/cocos2d
LOCAL_STATIC_LIBRARIES := luajit_static
LOCAL_STATIC_LIBRARIES += cocos2dx_static
include $(BUILD_STATIC_LIBRARY)
#libluacocos3d
include $(CLEAR_VARS)
LOCAL_MODULE := cocos3d_lua_static
LOCAL_MODULE_FILENAME := libluacocos3d
LOCAL_SRC_FILES := ../manual/3d/lua_cocos2dx_3d_manual.cpp \
#3d
LOCAL_SRC_FILES += ../manual/3d/lua_cocos2dx_3d_manual.cpp \
../auto/lua_cocos2dx_3d_auto.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual/3d \
$(LOCAL_PATH)/../../../3d \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/3d
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos3d_static
include $(BUILD_STATIC_LIBRARY)
#libluacocosdenshion
include $(CLEAR_VARS)
LOCAL_MODULE := cocosdenshion_lua_static
LOCAL_MODULE_FILENAME := libluacocosdenshion
LOCAL_SRC_FILES := ../manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp \
#cocosdenshion
LOCAL_SRC_FILES += ../manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp \
../auto/lua_cocos2dx_cocosdenshion_auto.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual/cocosdenshion \
$(LOCAL_PATH)/../../../audio/include \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosdenshion
LOCAL_STATIC_LIBRARIES := cocosdenshion_static
LOCAL_STATIC_LIBRARIES += cocos2d_lua_static
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := network_lua_static
LOCAL_MODULE_FILENAME := libluanetwork
LOCAL_SRC_FILES := ../manual/network/lua_cocos2dx_network_manual.cpp \
#network
LOCAL_SRC_FILES += ../manual/network/lua_cocos2dx_network_manual.cpp \
../manual/network/lua_extensions.c \
../manual/network/Lua_web_socket.cpp \
../manual/network/lua_xml_http_request.cpp \
@ -126,140 +57,83 @@ LOCAL_SRC_FILES := ../manual/network/lua_cocos2dx_network_manual.cpp \
../../../../external/lua/luasocket/timeout.c \
../../../../external/lua/luasocket/udp.c \
../../../../external/lua/luasocket/unix.c \
../../../../external/lua/luasocket/usocket.c \
../../../../external/lua/luasocket/usocket.c
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/network \
$(LOCAL_PATH)/../../../../external/lua \
$(LOCAL_PATH)/../../../network
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/network
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos_network_static
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := cocosbuilder_lua_static
LOCAL_MODULE_FILENAME := libluacocosbuilder
LOCAL_SRC_FILES := ../manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp \
#cocosbuilder
LOCAL_SRC_FILES += ../manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp \
../manual/cocosbuilder/CCBProxy.cpp \
../auto/lua_cocos2dx_cocosbuilder_auto.cpp \
../auto/lua_cocos2dx_cocosbuilder_auto.cpp
#cocostudio
LOCAL_SRC_FILES += ../manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp \
../auto/lua_cocos2dx_studio_auto.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosbuilder \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../../../editor-support/cocosbuilder
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosbuilder
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocosbuilder_static
include $(BUILD_STATIC_LIBRARY)
#
include $(CLEAR_VARS)
LOCAL_MODULE := cocostudio_lua_static
LOCAL_MODULE_FILENAME := libluacocostudio
LOCAL_SRC_FILES := ../manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp \
../auto/lua_cocos2dx_studio_auto.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/cocostudio \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../../../editor-support/cocostudio
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocostudio
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocostudio_static
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := spine_lua_static
LOCAL_MODULE_FILENAME := libluaspine
LOCAL_SRC_FILES := ../manual/spine/lua_cocos2dx_spine_manual.cpp \
#spine
LOCAL_SRC_FILES += ../manual/spine/lua_cocos2dx_spine_manual.cpp \
../manual/spine/LuaSkeletonAnimation.cpp \
../auto/lua_cocos2dx_spine_auto.cpp \
../auto/lua_cocos2dx_spine_auto.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/spine \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../../../editor-support/spine
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/spine
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += spine_static
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := extension_lua_static
LOCAL_MODULE_FILENAME := libluaextension
LOCAL_SRC_FILES := ../manual/extension/lua_cocos2dx_extension_manual.cpp \
../auto/lua_cocos2dx_extension_auto.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/extension \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../../../../extensions
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/extension
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos_extension_static
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := ui_lua_static
LOCAL_MODULE_FILENAME := libluaui
LOCAL_SRC_FILES := ../manual/ui/lua_cocos2dx_experimental_video_manual.cpp \
#ui
LOCAL_SRC_FILES += ../manual/ui/lua_cocos2dx_experimental_video_manual.cpp \
../manual/ui/lua_cocos2dx_ui_manual.cpp \
../auto/lua_cocos2dx_experimental_video_auto.cpp \
../auto/lua_cocos2dx_ui_auto.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/ui \
#extension
LOCAL_SRC_FILES += ../manual/extension/lua_cocos2dx_extension_manual.cpp \
../auto/lua_cocos2dx_extension_auto.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/luajit/include \
$(LOCAL_PATH)/../../../2d \
$(LOCAL_PATH)/../../../3d \
$(LOCAL_PATH)/../../../network \
$(LOCAL_PATH)/../../../editor-support/cocosbuilder \
$(LOCAL_PATH)/../../../editor-support/cocostudio \
$(LOCAL_PATH)/../../../editor-support/spine \
$(LOCAL_PATH)/../../../ui \
$(LOCAL_PATH)/../../../../extensions \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../../../ui
$(LOCAL_PATH)/../manual \
$(LOCAL_PATH)/../manual/cocos2d \
$(LOCAL_PATH)/../manual/3d \
$(LOCAL_PATH)/../manual/cocosdenshion \
$(LOCAL_PATH)/../manual/network \
$(LOCAL_PATH)/../manual/extension \
$(LOCAL_PATH)/../manual/cocostudio \
$(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_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/ui
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos_ui_static
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/luajit/include \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual \
$(LOCAL_PATH)/../manual/cocos2d \
$(LOCAL_PATH)/../manual/3d \
$(LOCAL_PATH)/../manual/cocosdenshion \
$(LOCAL_PATH)/../manual/network \
$(LOCAL_PATH)/../manual/cocosbuilder \
$(LOCAL_PATH)/../manual/cocostudio \
$(LOCAL_PATH)/../manual/spine \
$(LOCAL_PATH)/../manual/extension \
$(LOCAL_PATH)/../manual/ui \
$(LOCAL_PATH)/../../../..
LOCAL_STATIC_LIBRARIES := luajit_static
LOCAL_STATIC_LIBRARIES += cocos2dx_static
include $(BUILD_STATIC_LIBRARY)
$(call import-module,lua/luajit/prebuilt/android)
$(call import-module,.)
$(call import-module,audio/android)
$(call import-module,network)
$(call import-module,editor-support/cocosbuilder)
$(call import-module,editor-support/cocostudio)
$(call import-module,editor-support/spine)
$(call import-module,ui)
$(call import-module,extensions)
$(call import-module,3d)

3
tests/lua-empty-test/project/proj.android/jni/Android.mk
View File

@ -13,9 +13,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \
$(LOCAL_PATH)/../../../../../external/lua/tolua \
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocosdenshion_lua_static
LOCAL_STATIC_LIBRARIES += network_lua_static
include $(BUILD_SHARED_LIBRARY)

2
tests/lua-game-controller-test/project/proj.android/jni/Android.mk
View File

@ -18,8 +18,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \
$(LOCAL_PATH)/../../../../../cocos/base
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocosdenshion_static
include $(BUILD_SHARED_LIBRARY)