Skip to content

Commit 1e77b9c

Browse files
author
James Chen
committed
Merge pull request cocos2d#4004 from Dhilan007/di0004
issues cocos2d#2905:split jsbinding module
2 parents c275d58 + fa01c8b commit 1e77b9c

File tree

9 files changed

+201
-38
lines changed

9 files changed

+201
-38
lines changed

‎cocos/scripting/auto-generated‎

‎cocos/scripting/javascript/bindings/Android.mk‎

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,65 +8,34 @@ LOCAL_MODULE_FILENAME := libcocos2dxjsb
88

99
LOCAL_SRC_FILES := ScriptingCore.cpp \
1010
cocos2d_specifics.cpp \
11-
jsb_cocos2dx_extension_manual.cpp \
1211
js_manual_conversions.cpp \
1312
cocosjs_manual_conversions.cpp \
14-
js_bindings_chipmunk_manual.cpp \
15-
js_bindings_chipmunk_functions.cpp \
16-
js_bindings_chipmunk_auto_classes.cpp \
17-
js_bindings_chipmunk_registration.cpp \
18-
js_bindings_system_functions.cpp \
19-
js_bindings_system_registration.cpp \
20-
js_bindings_ccbreader.cpp \
2113
js_bindings_core.cpp \
2214
js_bindings_opengl.cpp \
2315
jsb_opengl_functions.cpp \
2416
jsb_opengl_manual.cpp \
2517
jsb_opengl_registration.cpp \
26-
../../auto-generated/js-bindings/jsb_cocos2dx_auto.cpp \
27-
../../auto-generated/js-bindings/jsb_cocos2dx_extension_auto.cpp \
28-
XMLHTTPRequest.cpp \
29-
jsb_websocket.cpp
18+
../../auto-generated/js-bindings/jsb_cocos2dx_auto.cpp
3019

3120
LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT
3221

3322
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_JAVASCRIPT
3423

3524
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
36-
$(LOCAL_PATH)/../../../CocosDenshion/include \
25+
$(LOCAL_PATH)/../../../audio/include \
26+
$(LOCAL_PATH)/../../../storage \
3727
$(LOCAL_PATH)/../../auto-generated/js-bindings \
38-
$(LOCAL_PATH)/../../../../extensions \
39-
$(LOCAL_PATH)/../../../editor-support/cocostudio \
40-
$(LOCAL_PATH)/../../../editor-support/cocosbuilder
28+
$(LOCAL_PATH)/../../../../extensions
4129

4230
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
43-
$(LOCAL_PATH)/../../auto-generated/js-bindings
31+
$(LOCAL_PATH)/../../auto-generated/js-bindings \
32+
$(LOCAL_PATH)/../../../audio/include
4433

4534
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
4635
LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static
47-
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
48-
LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
49-
LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
5036
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
51-
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
52-
LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
53-
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_localstorage_static
54-
LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
55-
LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static
56-
57-
LOCAL_LDLIBS := -landroid
58-
LOCAL_LDLIBS += -llog
5937

6038
include $(BUILD_STATIC_LIBRARY)
6139

6240
$(call import-module,spidermonkey/prebuilt/android)
63-
$(call import-module,extensions)
6441
$(call import-module,2d)
65-
$(call import-module,extensions)
66-
$(call import-module,editor-support/cocosbuilder)
67-
$(call import-module,editor-support/spine)
68-
$(call import-module,network)
69-
$(call import-module,chipmunk)
70-
$(call import-module,storage/local-storage)
71-
$(call import-module,editor-support/cocostudio)
72-
$(call import-module,websockets/prebuilt/android)

‎cocos/scripting/javascript/bindings/chipmunk/Android.mk‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
LOCAL_PATH := $(call my-dir)
2+
3+
include $(CLEAR_VARS)
4+
5+
LOCAL_MODULE := jsb_chipmunk_static
6+
7+
LOCAL_MODULE_FILENAME := libcocos2dxjsbchipmunk
8+
9+
LOCAL_SRC_FILES := js_bindings_chipmunk_manual.cpp \
10+
js_bindings_chipmunk_functions.cpp \
11+
js_bindings_chipmunk_auto_classes.cpp \
12+
js_bindings_chipmunk_registration.cpp
13+
14+
LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT
15+
16+
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_JAVASCRIPT
17+
18+
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
19+
$(LOCAL_PATH)/../../../../..
20+
21+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
22+
23+
LOCAL_WHOLE_STATIC_LIBRARIES := spidermonkey_static
24+
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jsb_static
25+
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
26+
LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
27+
28+
include $(BUILD_STATIC_LIBRARY)
29+
30+
$(call import-module,spidermonkey/prebuilt/android)
31+
$(call import-module,scripting/javascript/bindings)
32+
$(call import-module,extensions)
33+
$(call import-module,chipmunk)

‎cocos/scripting/javascript/bindings/cocosbuilder/Android.mk‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
LOCAL_PATH := $(call my-dir)
2+
3+
include $(CLEAR_VARS)
4+
5+
LOCAL_MODULE := jsb_builder_static
6+
7+
LOCAL_MODULE_FILENAME := libcocos2dxjsbbuilder
8+
9+
LOCAL_SRC_FILES := js_bindings_ccbreader.cpp \
10+
../../../auto-generated/js-bindings/jsb_cocos2dx_builder_auto.cpp
11+
12+
LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT
13+
14+
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_JAVASCRIPT
15+
16+
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
17+
$(LOCAL_PATH)/../../../../editor-support/cocosbuilder
18+
19+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
20+
21+
LOCAL_WHOLE_STATIC_LIBRARIES := spidermonkey_static
22+
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jsb_static
23+
LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
24+
25+
include $(BUILD_STATIC_LIBRARY)
26+
27+
$(call import-module,spidermonkey/prebuilt/android)
28+
$(call import-module,scripting/javascript/bindings)
29+
$(call import-module,editor-support/cocosbuilder)

‎cocos/scripting/javascript/bindings/cocostudio/Android.mk‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
LOCAL_PATH := $(call my-dir)
2+
3+
include $(CLEAR_VARS)
4+
5+
LOCAL_MODULE := jsb_studio_static
6+
7+
LOCAL_MODULE_FILENAME := libcocos2dxjsbstudio
8+
9+
LOCAL_SRC_FILES := jsb_cocos2dx_studio_manual.cpp \
10+
../../../auto-generated/js-bindings/jsb_cocos2dx_studio_auto.cpp
11+
12+
LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT
13+
14+
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_JAVASCRIPT
15+
16+
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
17+
$(LOCAL_PATH)/../../../../../extensions \
18+
$(LOCAL_PATH)/../../../../editor-support/cocostudio
19+
20+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
21+
22+
LOCAL_WHOLE_STATIC_LIBRARIES := spidermonkey_static
23+
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jsb_static
24+
LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
25+
26+
include $(BUILD_STATIC_LIBRARY)
27+
28+
$(call import-module,spidermonkey/prebuilt/android)
29+
$(call import-module,scripting/javascript/bindings)
30+
$(call import-module,editor-support/cocostudio)

‎cocos/scripting/javascript/bindings/extension/Android.mk‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
LOCAL_PATH := $(call my-dir)
2+
3+
include $(CLEAR_VARS)
4+
5+
LOCAL_MODULE := jsb_extension_static
6+
7+
LOCAL_MODULE_FILENAME := libcocos2dxjsbextension
8+
9+
LOCAL_SRC_FILES := jsb_cocos2dx_extension_manual.cpp \
10+
../../../auto-generated/js-bindings/jsb_cocos2dx_extension_auto.cpp
11+
12+
LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT
13+
14+
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_JAVASCRIPT
15+
16+
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
17+
$(LOCAL_PATH)/../../../../../extensions
18+
19+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
20+
$(LOCAL_PATH)/../../../../../
21+
22+
LOCAL_WHOLE_STATIC_LIBRARIES := spidermonkey_static
23+
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jsb_static
24+
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
25+
26+
include $(BUILD_STATIC_LIBRARY)
27+
28+
$(call import-module,spidermonkey/prebuilt/android)
29+
$(call import-module,scripting/javascript/bindings)
30+
$(call import-module,extensions)

‎cocos/scripting/javascript/bindings/localstorage/Android.mk‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
LOCAL_PATH := $(call my-dir)
2+
3+
include $(CLEAR_VARS)
4+
5+
LOCAL_MODULE := jsb_localstorage_static
6+
7+
LOCAL_MODULE_FILENAME := libcocos2dxjsblocalstorage
8+
9+
LOCAL_SRC_FILES := js_bindings_system_functions.cpp \
10+
js_bindings_system_registration.cpp
11+
12+
LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT
13+
14+
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_JAVASCRIPT
15+
16+
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
17+
$(LOCAL_PATH)/../../../../../extensions
18+
19+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
20+
21+
LOCAL_WHOLE_STATIC_LIBRARIES := spidermonkey_static
22+
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jsb_static
23+
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_localstorage_static
24+
25+
include $(BUILD_STATIC_LIBRARY)
26+
27+
$(call import-module,spidermonkey/prebuilt/android)
28+
$(call import-module,scripting/javascript/bindings)
29+
$(call import-module,storage/local-storage)

‎cocos/scripting/javascript/bindings/network/Android.mk‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
LOCAL_PATH := $(call my-dir)
2+
3+
include $(CLEAR_VARS)
4+
5+
LOCAL_MODULE := jsb_network_static
6+
7+
LOCAL_MODULE_FILENAME := libcocos2dxjsbnetwork
8+
9+
LOCAL_SRC_FILES := XMLHTTPRequest.cpp \
10+
jsb_websocket.cpp
11+
12+
LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT
13+
14+
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_JAVASCRIPT
15+
16+
LOCAL_C_INCLUDES := $(LOCAL_PATH)
17+
18+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
19+
20+
LOCAL_WHOLE_STATIC_LIBRARIES := spidermonkey_static
21+
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jsb_static
22+
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
23+
LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static
24+
25+
include $(BUILD_STATIC_LIBRARY)
26+
27+
$(call import-module,spidermonkey/prebuilt/android)
28+
$(call import-module,scripting/javascript/bindings)
29+
$(call import-module,network)
30+
$(call import-module,websockets/prebuilt/android)

‎samples/Javascript/TestJavascript/proj.android/jni/Android.mk‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,22 @@ LOCAL_SRC_FILES := testjavascript/main.cpp \
1212
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
1313

1414
LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static
15+
LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static
16+
LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static
17+
LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static
18+
LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static
19+
LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static
20+
LOCAL_WHOLE_STATIC_LIBRARIES += jsb_studio_static
21+
1522

1623
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2
1724

1825
include $(BUILD_SHARED_LIBRARY)
1926

2027
$(call import-module,scripting/javascript/bindings)
28+
$(call import-module,scripting/javascript/bindings/chipmunk)
29+
$(call import-module,scripting/javascript/bindings/extension)
30+
$(call import-module,scripting/javascript/bindings/localstorage)
31+
$(call import-module,scripting/javascript/bindings/network)
32+
$(call import-module,scripting/javascript/bindings/cocosbuilder)
33+
$(call import-module,scripting/javascript/bindings/cocostudio)

0 commit comments

Comments
 (0)