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

Merge pull request #4814 from dumganhar/jsb-spine-module 

[Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module.
This commit is contained in:
James Chen 2014-01-02 18:45:57 -08:00
parent 93d724f408 04760f2508
commit 7774a948f0
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/scripting/javascript/bindings/Android.mk
View File

@ -14,8 +14,7 @@ LOCAL_SRC_FILES := ScriptingCore.cpp \
jsb_opengl_functions.cpp \ jsb_opengl_functions.cpp \
jsb_opengl_manual.cpp \ jsb_opengl_manual.cpp \
jsb_opengl_registration.cpp \ jsb_opengl_registration.cpp \
../../auto-generated/js-bindings/jsb_cocos2dx_auto.cpp \ ../../auto-generated/js-bindings/jsb_cocos2dx_auto.cpp
../../auto-generated/js-bindings/jsb_cocos2dx_spine_auto.cpp
LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT

29
cocos/scripting/javascript/bindings/spine/Android.mk Normal file
View File

@ -0,0 +1,29 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := jsb_spine_static
LOCAL_MODULE_FILENAME := libcocos2dxjsbspine
LOCAL_SRC_FILES := ../../../auto-generated/js-bindings/jsb_cocos2dx_spine_auto.cpp
LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_JAVASCRIPT
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/../../../../editor-support/spine
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
LOCAL_WHOLE_STATIC_LIBRARIES := spidermonkey_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jsb_static
LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
include $(BUILD_STATIC_LIBRARY)
$(call import-module,spidermonkey/prebuilt/android)
$(call import-module,scripting/javascript/bindings)
$(call import-module,editor-support/spine)

4
samples/Javascript/TestJavascript/proj.android/jni/Android.mk
View File

@ -19,7 +19,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static
LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static
LOCAL_WHOLE_STATIC_LIBRARIES += jsb_gui_static LOCAL_WHOLE_STATIC_LIBRARIES += jsb_gui_static
LOCAL_WHOLE_STATIC_LIBRARIES += jsb_studio_static LOCAL_WHOLE_STATIC_LIBRARIES += jsb_studio_static
LOCAL_WHOLE_STATIC_LIBRARIES += spine_static LOCAL_WHOLE_STATIC_LIBRARIES += jsb_spine_static
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2
@ -34,4 +34,4 @@ $(call import-module,scripting/javascript/bindings/network)
$(call import-module,scripting/javascript/bindings/cocosbuilder) $(call import-module,scripting/javascript/bindings/cocosbuilder)
$(call import-module,scripting/javascript/bindings/gui) $(call import-module,scripting/javascript/bindings/gui)
$(call import-module,scripting/javascript/bindings/cocostudio) $(call import-module,scripting/javascript/bindings/cocostudio)
$(call import-module,editor-support/spine) $(call import-module,scripting/javascript/bindings/spine)