Merge pull request cocos2d#714 from minggo/ndk_module

fixed cocos2d#970: use modules in the android ndk build
angeltown · Feb 8, 2012 · a8e153d · a8e153d
2 parents d680784 + 0683fdd
commit a8e153d
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 40 deletions.
diff --git a/HelloLua/Classes/Android.mk b/HelloLua/Classes/Android.mk
@@ -1,6 +1,10 @@
 LOCAL_PATH := $(call my-dir)
+
 include $(CLEAR_VARS)
-LOCAL_MODULE := game_logic
+
+LOCAL_MODULE := game_logic_shared
+
+LOCAL_MODULE_FILENAME := libgame_logic
 
 LOCAL_SRC_FILES := \
 AppDelegate.cpp \
@@ -10,20 +14,8 @@ AppDelegate.cpp \
 ../../lua/cocos2dx_support/LuaEngine.cpp \
 ../../lua/CocosDenshion_support/LuaSimpleAudioEngine.cpp
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../cocos2dx \
-                    $(LOCAL_PATH)/../../cocos2dx/platform \
-                    $(LOCAL_PATH)/../../cocos2dx/include \
-                    $(LOCAL_PATH)/../../cocos2dx/lua_support \
-                    $(LOCAL_PATH)/../../CocosDenshion/include \
-                    $(LOCAL_PATH)/../../lua/lua \
-                    $(LOCAL_PATH)/../../lua/tolua \
-                    $(LOCAL_PATH)/../../lua/cocos2dx_support \
-                    $(LOCAL_PATH)/../../lua/CocosDenshion_support
-
-LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../android/libs/$(TARGET_ARCH_ABI)) \
-		-L$(call host-path, $(LOCAL_PATH)/../../cocos2dx/platform/third_party/android/libraries/$(TARGET_ARCH_ABI)) -lcurl \
-		-lcocos2d \
-		-lcocosdenshion \
-		-llua
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SHARED_LIBRARIES := cocos2dx_shared cocosdenshion_shared lua_shared
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/HelloLua/android/jni/Application.mk b/HelloLua/android/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS += -frtti
 
-APP_MODULES := cocos2d cocosdenshion lua game_logic game
+APP_MODULES := cocos2dx_shared cocosdenshion_shared lua_shared game_logic_shared game_shared
diff --git a/HelloLua/android/jni/helloworld/Android.mk b/HelloLua/android/jni/helloworld/Android.mk
@@ -1,17 +1,13 @@
 LOCAL_PATH := $(call my-dir)
+
 include $(CLEAR_VARS)
-LOCAL_MODULE := game
 
-LOCAL_SRC_FILES := main.cpp 
+LOCAL_MODULE := game_shared
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos2dx \
-                    $(LOCAL_PATH)/../../../../cocos2dx/platform \
-                    $(LOCAL_PATH)/../../../../cocos2dx/include \
-                    $(LOCAL_PATH)/../../../../lua/cocos2dx_support \
-                    $(LOCAL_PATH)/../../../Classes 
+LOCAL_MODULE_FILENAME := libgame
+
+LOCAL_SRC_FILES := main.cpp 
 
-LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/$(TARGET_ARCH_ABI)) \
-		-lcocos2d \
-		-lgame_logic
+LOCAL_SHARED_LIBRARIES := cocos2dx_shared game_logic_shared
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/HelloWorld/Classes/Android.mk b/HelloWorld/Classes/Android.mk
@@ -1,8 +1,10 @@
 LOCAL_PATH := $(call my-dir)
+
 include $(CLEAR_VARS)
-LOCAL_MODULE := game_shared
 
-LOCAL_MODULE_FILENAME := libgame
+LOCAL_MODULE := game_logic_shared
+
+LOCAL_MODULE_FILENAME := libgame_logic
 
 LOCAL_SRC_FILES := AppDelegate.cpp \
                    HelloWorldScene.cpp

diff --git a/HelloWorld/android/jni/Application.mk b/HelloWorld/android/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS += -frtti
 
-APP_MODULES := cocos2dx_shared cocosdenshion_shared game_shared helloworld_shared
+APP_MODULES := cocos2dx_shared cocosdenshion_shared game_logic_shared helloworld_shared
diff --git a/HelloWorld/android/jni/helloworld/Android.mk b/HelloWorld/android/jni/helloworld/Android.mk
@@ -4,10 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := helloworld_shared
 
-LOCAL_MODULE_FILENAME := helloworld
+LOCAL_MODULE_FILENAME := libhelloworld
 
 LOCAL_SRC_FILES := main.cpp
 
-LOCAL_SHARED_LIBRARIES := cocos2dx_shared game_logic
+LOCAL_SHARED_LIBRARIES := cocos2dx_shared game_logic_shared
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/lua/proj.android/jni/Android.mk b/lua/proj.android/jni/Android.mk
@@ -2,7 +2,10 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE    := lua
+LOCAL_MODULE    := lua_shared
+
+LOCAL_MODULE_FILENAME := liblua
+
 LOCAL_SRC_FILES :=../../lua/lapi.c \
                   ../../lua/lauxlib.c \
 		  ../../lua/lbaselib.c \
@@ -41,6 +44,11 @@ LOCAL_SRC_FILES :=../../lua/lapi.c \
 		  ../../tolua/tolua_push.c \
 		  ../../tolua/tolua_to.c
 
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../lua \
+                           $(LOCAL_PATH)/../../tolua \
+                           $(LOCAL_PATH)/../../cocos2dx_support \
+                           $(LOCAL_PATH)/../../CocosDenshion_support
+
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
                     $(LOCAL_PATH)/../../lua 

diff --git a/lua/proj.android/jni/Application.mk b/lua/proj.android/jni/Application.mk
diff --git a/template/android/AndroidTemplate1.mk b/template/android/AndroidTemplate1.mk
@@ -1,11 +1,13 @@
 LOCAL_PATH := $(call my-dir)
+
 include $(CLEAR_VARS)
-LOCAL_MODULE := game
+
+LOCAL_MODULE := game_shared
 
 LOCAL_MODULE_FILENAME := libgame
 
 LOCAL_SRC_FILES := main.cpp
 
-LOCAL_SHARED_LIBRARIES := cocos2dx_shared game_shared
+LOCAL_SHARED_LIBRARIES := cocos2dx_shared game_logic_shared
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/template/android/Application.mk b/template/android/Application.mk
@@ -1,3 +1,3 @@
 APP_STL := stlport_static
 APP_CPPFLAGS += -frtti
-APP_MODULES := cocos2dx_shared cocosdenshion_shared game_shared game
+APP_MODULES := cocos2dx_shared cocosdenshion_shared game_logic_shared game_shared
diff --git a/tests/Android.mk b/tests/Android.mk
@@ -2,9 +2,9 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := game_shared
+LOCAL_MODULE := game_logic_shared
 
-LOCAL_MODULE_FILENAME := libgame
+LOCAL_MODULE_FILENAME := libgame_logic
 
 LOCAL_SRC_FILES := \
 tests/AccelerometerTest/AccelerometerTest.cpp \

diff --git a/tests/test.android/jni/Application.mk b/tests/test.android/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS += -frtti
 
-APP_MODULES := cocos2dx_shared cocosdenshion_shared chipmunk_shared box2d_shared game_shared tests_shared
+APP_MODULES := cocos2dx_shared cocosdenshion_shared chipmunk_shared box2d_shared game_logic_shared tests_shared
diff --git a/tests/test.android/jni/tests/Android.mk b/tests/test.android/jni/tests/Android.mk
@@ -8,7 +8,7 @@ LOCAL_MODULE_FILENAME := libtests
 
 LOCAL_SRC_FILES := main.cpp
 
-LOCAL_SHARED_LIBRARIES := cocos2dx_shared game_shared
+LOCAL_SHARED_LIBRARIES := cocos2dx_shared game_logic_shared
 
 include $(BUILD_SHARED_LIBRARY)