From bef774a14aa141273be9830f90fc1e25b1ea0c95 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Wed, 27 Aug 2014 22:54:28 +0800 Subject: [PATCH] Adjust android.mk for cocos2d and related module --- cocos/3d/Android.mk | 2 +- cocos/Android.mk | 33 ++++++++++++-------- cocos/editor-support/cocosbuilder/Android.mk | 2 +- cocos/editor-support/cocostudio/Android.mk | 2 +- cocos/editor-support/spine/Android.mk | 2 +- cocos/network/Android.mk | 2 +- cocos/storage/local-storage/Android.mk | 2 +- cocos/ui/Android.mk | 2 +- extensions/Android.mk | 2 +- 9 files changed, 28 insertions(+), 21 deletions(-) diff --git a/cocos/3d/Android.mk b/cocos/3d/Android.mk index d67b36b107..0a9d859a27 100644 --- a/cocos/3d/Android.mk +++ b/cocos/3d/Android.mk @@ -28,6 +28,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../../external \ $(LOCAL_PATH)/../platform/android -LOCAL_STATIC_LIBRARIES := cocos2dx_static +LOCAL_STATIC_LIBRARIES := cocos2dx_internal_static include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/Android.mk b/cocos/Android.mk index 88a955af29..94c14a9824 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -2,9 +2,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := cocos2dx_static +LOCAL_MODULE := cocos2dx_internal_static -LOCAL_MODULE_FILENAME := libcocos2d +LOCAL_MODULE_FILENAME := libcocos2dxinternal LOCAL_SRC_FILES := \ cocos2d.cpp \ @@ -216,18 +216,7 @@ LOCAL_STATIC_LIBRARIES += cocos_png_static LOCAL_STATIC_LIBRARIES += cocos_jpeg_static LOCAL_STATIC_LIBRARIES += cocos_tiff_static LOCAL_STATIC_LIBRARIES += cocos_webp_static -LOCAL_STATIC_LIBRARIES += cocos3d_static -LOCAL_STATIC_LIBRARIES += cocosdenshion_static -LOCAL_STATIC_LIBRARIES += cocosbuilder_static -LOCAL_STATIC_LIBRARIES += cocostudio_static -LOCAL_STATIC_LIBRARIES += spine_static -LOCAL_STATIC_LIBRARIES += cocos_network_static -LOCAL_STATIC_LIBRARIES += cocos_ui_static -LOCAL_STATIC_LIBRARIES += cocos_extension_static -LOCAL_STATIC_LIBRARIES += box2d_static LOCAL_STATIC_LIBRARIES += chipmunk_static -LOCAL_STATIC_LIBRARIES += cocos_curl_static -LOCAL_STATIC_LIBRARIES += libwebsockets_static LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dxandroid_static @@ -239,6 +228,24 @@ LOCAL_EXPORT_CPPFLAGS := -Wno-deprecated-declarations -Wno-extern-c-compat include $(BUILD_STATIC_LIBRARY) +#============================================================== + +include $(CLEAR_VARS) + +LOCAL_MODULE := cocos2dx_static + +LOCAL_MODULE_FILENAME := libcocos2d + +LOCAL_STATIC_LIBRARIES := cocostudio_static +LOCAL_STATIC_LIBRARIES += cocos3d_static +LOCAL_STATIC_LIBRARIES += cocosbuilder_static +LOCAL_STATIC_LIBRARIES += spine_static +LOCAL_STATIC_LIBRARIES += cocos_network_static +LOCAL_STATIC_LIBRARIES += box2d_static +LOCAL_STATIC_LIBRARIES += chipmunk_static + +include $(BUILD_STATIC_LIBRARY) +#============================================================== $(call import-module,freetype2/prebuilt/android) $(call import-module,chipmunk) $(call import-module,platform/android) diff --git a/cocos/editor-support/cocosbuilder/Android.mk b/cocos/editor-support/cocosbuilder/Android.mk index 36089ec055..747d9827cd 100644 --- a/cocos/editor-support/cocosbuilder/Android.mk +++ b/cocos/editor-support/cocosbuilder/Android.mk @@ -38,7 +38,7 @@ $(LOCAL_PATH)/../../ \ $(LOCAL_PATH)/../../platform/android \ $(LOCAL_PATH)/../../editor-support -LOCAL_STATIC_LIBRARIES := cocos2dx_static +LOCAL_STATIC_LIBRARIES := cocos2dx_internal_static LOCAL_STATIC_LIBRARIES := cocos_extension_static include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk index f4ffa5dcbd..a9b5b55439 100644 --- a/cocos/editor-support/cocostudio/Android.mk +++ b/cocos/editor-support/cocostudio/Android.mk @@ -76,7 +76,7 @@ LOCAL_CFLAGS += -fexceptions LOCAL_STATIC_LIBRARIES := cocos_ui_static LOCAL_STATIC_LIBRARIES += cocosdenshion_static LOCAL_STATIC_LIBRARIES += cocos_extension_static -LOCAL_STATIC_LIBRARIES += cocos2dx_static +LOCAL_STATIC_LIBRARIES += cocos2dx_internal_static include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/editor-support/spine/Android.mk b/cocos/editor-support/spine/Android.mk index f49532d9c8..118f45c52e 100644 --- a/cocos/editor-support/spine/Android.mk +++ b/cocos/editor-support/spine/Android.mk @@ -37,6 +37,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../../platform/android -LOCAL_STATIC_LIBRARIES := cocos2dx_static +LOCAL_STATIC_LIBRARIES := cocos2dx_internal_static include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/network/Android.mk b/cocos/network/Android.mk index 96a760cfb3..e056ad41c5 100644 --- a/cocos/network/Android.mk +++ b/cocos/network/Android.mk @@ -18,7 +18,7 @@ $(LOCAL_PATH)/../platform/android \ $(LOCAL_PATH)/../../external/curl/include/android \ $(LOCAL_PATH)/../../external/websockets/include/android -LOCAL_STATIC_LIBRARIES := cocos2dx_static +LOCAL_STATIC_LIBRARIES := cocos2dx_internal_static LOCAL_STATIC_LIBRARIES += cocos_curl_static LOCAL_STATIC_LIBRARIES += libwebsockets_static diff --git a/cocos/storage/local-storage/Android.mk b/cocos/storage/local-storage/Android.mk index 3a7a2604ee..65a29778fd 100644 --- a/cocos/storage/local-storage/Android.mk +++ b/cocos/storage/local-storage/Android.mk @@ -17,7 +17,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. LOCAL_CFLAGS += -Wno-psabi LOCAL_EXPORT_CFLAGS += -Wno-psabi -LOCAL_STATIC_LIBRARIES := cocos2dx_static +LOCAL_STATIC_LIBRARIES := cocos2dx_internal_static include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/ui/Android.mk b/cocos/ui/Android.mk index cabe2e9e8a..78bd2c4630 100644 --- a/cocos/ui/Android.mk +++ b/cocos/ui/Android.mk @@ -42,7 +42,7 @@ $(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/../editor-support \ $(LOCAL_PATH)/../platform/android -LOCAL_STATIC_LIBRARIES := cocos2dx_static +LOCAL_STATIC_LIBRARIES := cocos2dx_internal_static LOCAL_STATIC_LIBRARIES += cocos_extension_static include $(BUILD_STATIC_LIBRARY) diff --git a/extensions/Android.mk b/extensions/Android.mk index 04fed90e66..89877aa54d 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -29,7 +29,7 @@ GUI/CCScrollView/CCTableViewCell.cpp \ physics-nodes/CCPhysicsDebugNode.cpp \ physics-nodes/CCPhysicsSprite.cpp -LOCAL_STATIC_LIBRARIES := cocos2dx_static +LOCAL_STATIC_LIBRARIES := cocos2dx_internal_static LOCAL_STATIC_LIBRARIES += cocos_curl_static LOCAL_STATIC_LIBRARIES += box2d_static