From b751c41498c32e279870a827b428b6207bbf4ece Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 1 Nov 2013 18:27:47 +0800 Subject: [PATCH] [Android] Updating Android.mk for JSB projects. --- .../AssetsManagerTest/proj.android/jni/Android.mk | 10 ++++++++++ .../CocosDragonJS/proj.android/jni/Android.mk | 11 +++++++++++ .../CrystalCraze/proj.android/jni/Android.mk | 10 ++++++++++ .../MoonWarriors/proj.android/jni/Android.mk | 12 +++++++++++- .../WatermelonWithMe/proj.android/jni/Android.mk | 12 +++++++++++- 5 files changed, 53 insertions(+), 2 deletions(-) diff --git a/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk b/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk index 78d938432f..28588e400a 100644 --- a/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk +++ b/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk @@ -12,9 +12,19 @@ LOCAL_SRC_FILES := hellocpp/main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT include $(BUILD_SHARED_LIBRARY) $(call import-module,scripting/javascript/bindings) +$(call import-module,scripting/javascript/bindings/chipmunk) +$(call import-module,scripting/javascript/bindings/extension) +$(call import-module,scripting/javascript/bindings/localstorage) +$(call import-module,scripting/javascript/bindings/network) +$(call import-module,scripting/javascript/bindings/cocosbuilder) diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk b/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk index e06290f84b..1e65b8e7a5 100644 --- a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk +++ b/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk @@ -12,9 +12,20 @@ LOCAL_SRC_FILES := cocosdragonjs/main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT include $(BUILD_SHARED_LIBRARY) $(call import-module,scripting/javascript/bindings) +$(call import-module,scripting/javascript/bindings/chipmunk) +$(call import-module,scripting/javascript/bindings/extension) +$(call import-module,scripting/javascript/bindings/localstorage) +$(call import-module,scripting/javascript/bindings/network) +$(call import-module,scripting/javascript/bindings/cocosbuilder) + diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk b/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk index 3258f123af..9c8854568c 100644 --- a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk +++ b/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk @@ -12,9 +12,19 @@ LOCAL_SRC_FILES := crystalcraze/main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT include $(BUILD_SHARED_LIBRARY) $(call import-module,scripting/javascript/bindings) +$(call import-module,scripting/javascript/bindings/chipmunk) +$(call import-module,scripting/javascript/bindings/extension) +$(call import-module,scripting/javascript/bindings/localstorage) +$(call import-module,scripting/javascript/bindings/network) +$(call import-module,scripting/javascript/bindings/cocosbuilder) diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk b/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk index c409b4790b..93726f5b70 100644 --- a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk +++ b/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk @@ -12,9 +12,19 @@ LOCAL_SRC_FILES := moonwarriors/main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT include $(BUILD_SHARED_LIBRARY) -$(call import-module,scripting/javascript/bindings +$(call import-module,scripting/javascript/bindings) +$(call import-module,scripting/javascript/bindings/chipmunk) +$(call import-module,scripting/javascript/bindings/extension) +$(call import-module,scripting/javascript/bindings/localstorage) +$(call import-module,scripting/javascript/bindings/network) +$(call import-module,scripting/javascript/bindings/cocosbuilder) diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk b/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk index b666e13723..2d7b4097ab 100644 --- a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk +++ b/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk @@ -12,9 +12,19 @@ LOCAL_SRC_FILES := watermelonwithme/main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static +LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT include $(BUILD_SHARED_LIBRARY) -$(call import-module,scripting/javascript/bindings +$(call import-module,scripting/javascript/bindings) +$(call import-module,scripting/javascript/bindings/chipmunk) +$(call import-module,scripting/javascript/bindings/extension) +$(call import-module,scripting/javascript/bindings/localstorage) +$(call import-module,scripting/javascript/bindings/network) +$(call import-module,scripting/javascript/bindings/cocosbuilder)