fixed #982: android template works ok on linux

cocos2d · Feb 29, 2012 · 3fdc1ad · 3fdc1ad
1 parent f642de4
commit 3fdc1ad
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 35 deletions.
diff --git a/create-android-project.sh b/create-android-project.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # This script should be called by create-android-project.bat
 # or should be runned in linux shell. It can not be runned under
 # cygwin.
@@ -57,8 +57,8 @@ check_param(){
         esac
     done
 
-    if [ $NEED_BOX2D == "true" ]; then
+    if [ $NEED_BOX2D = "true" ]; then
-        if [ $NEED_CHIPMUNK == "true" ]; then 
+        if [ $NEED_CHIPMUNK = "true" ]; then 
             echo Warning!!!
             echo Use box2d and chipmunk together????
         fi
@@ -122,7 +122,7 @@ PARAMS=$@
 check_param
 create_android_project
 
-if [ $0 == "linux" ]; then
+if [ $0 = "linux" ]; then
     # invoked by create-linux-android-project.sh
     sh `pwd`/template/linux/mycopy_files.sh `pwd` $PROJECT_NAME $NDK_ROOT_LOCAL $PACKAGE_PATH $NEED_BOX2D $NEED_CHIPMUNK $NEED_LUA
 else

diff --git a/template/android/application.sh b/template/android/application.sh
@@ -1,22 +1,24 @@
+#!/bin/bash
+
 FILE=$1
 NEED_BOX2D=$2
 NEED_CHIPMUNK=$3
 NEED_LUA=$4
 
 APP_MODULES="APP_MODULES := cocos2dx_static cocosdenshion_shared"
-if [ $NEED_BOX2D == "true" ];then
+if [ $NEED_BOX2D = "true" ];then
-    APP_MODULES+=" box2d_shared"
+    APP_MODULES=$APP_MODULES" box2d_shared"
 fi
 
-if [ $NEED_CHIPMUNK == "true" ]; then
+if [ $NEED_CHIPMUNK = "true" ]; then
-    APP_MODULES+=" chipmunk_shared"
+    APP_MODULES=$APP_MODULES" chipmunk_shared"
 fi
 
-if [ $NEED_LUA == "true" ]; then
+if [ $NEED_LUA = "true" ]; then
-    APP_MODULES+=" lua_shared"
+    APP_MODULES=$APP_MODULES" lua_shared"
 fi
 
-APP_MODULES+=" game_shared"
+APP_MODULES=$APP_MODULES" game_shared"
 
 cat > $FILE << EOF
 APP_STL := gnustl_static

diff --git a/template/android/classesmk.sh b/template/android/classesmk.sh
@@ -1,20 +1,22 @@
+#!/bin/bash
+
 FILE=$1
 NEED_BOX2D=$2
 NEED_CHIPMUNK=$3
 NEED_LUA=$4
 
 LOCAL_SHARED_LIBRARIES="LOCAL_SHARED_LIBRARIES := cocosdenshion_shared"
 
-if [ $NEED_BOX2D == "true" ];then
+if [ $NEED_BOX2D = "true" ];then
-    LOCAL_SHARED_LIBRARIES+=" box2d_shared"
+    LOCAL_SHARED_LIBRARIES=$LOCAL_SHARED_LIBRARIES" box2d_shared"
 fi
 
-if [ $NEED_CHIPMUNK == "true" ]; then
+if [ $NEED_CHIPMUNK = "true" ]; then
-    LOCAL_SHARED_LIBRARIES+=" chipmunk_shared"
+    LOCAL_SHARED_LIBRARIES=$LOCAL_SHARED_LIBRARIES" chipmunk_shared"
 fi
 
-if [ $NEED_LUA == "true" ]; then
+if [ $NEED_LUA = "true" ]; then
-    LOCAL_SHARED_LIBRARIES+=" lua_shared"
+    LOCAL_SHARED_LIBRARIES=$LOCAL_SHARED_LIBRARIES" lua_shared"
 fi
 
 cat > $FILE << EOF
@@ -43,4 +45,4 @@ include \$(BUILD_STATIC_LIBRARY)
 \$(call import-module,cocos2dx/platform/third_party/android/modules/libpng)
 \$(call import-module,cocos2dx/platform/third_party/android/modules/libxml2)
 \$(call import-module,cocos2dx/platform/third_party/android/modules/libjpeg)
-EOF
+EOF
diff --git a/template/android/copy_files.sh b/template/android/copy_files.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # check the args
 # $1: root of cocos2dx $2: app name $3: ndk root $4:pakcage path
 
@@ -90,16 +91,16 @@ modify_applicationdemo(){
 
     # load need .so
     CONTENT=
-    if [ $NEED_BOX2D == "true" ];then
+    if [ $NEED_BOX2D = "true" ];then
-        CONTENT+='System.loadLibrary("box2d");'
+        CONTENT=$CONTENT'System.loadLibrary("box2d");'
     fi
 
-    if [ $NEED_CHIPMUNK == "true" ]; then
+    if [ $NEED_CHIPMUNK = "true" ]; then
-        CONTENT+='System.loadLibrary("chipmunk");'
+        CONTENT=$CONTENT'System.loadLibrary("chipmunk");'
     fi
 
-    if [ $NEED_LUA == "true" ]; then
+    if [ $NEED_LUA = "true" ]; then
-        CONTENT+='System.loadLibrary("lua");'
+        CONTENT=$CONTENT'System.loadLibrary("lua");'
     fi
 
     sed -i "/cocosdenshion/ i\ $CONTENT" $APP_DIR/android/src/$PACKAGE_PATH_DIR/$APP_NAME.java

diff --git a/template/android/gamemk.sh b/template/android/gamemk.sh
@@ -1,20 +1,22 @@
+#!/bin/bash
+
 FILE=$1
 NEED_BOX2D=$2
 NEED_CHIPMUNK=$3
 NEED_LUA=$4
 
 LOCAL_SHARED_LIBRARIES="LOCAL_SHARED_LIBRARIES := cocosdenshion_shared"
 
-if [ $NEED_BOX2D == "true" ];then
+if [ $NEED_BOX2D = "true" ];then
-    LOCAL_SHARED_LIBRARIES+=" box2d_shared"
+    LOCAL_SHARED_LIBRARIES=$LOCAL_SHARED_LIBRARIES" box2d_shared"
 fi
 
-if [ $NEED_CHIPMUNK == "true" ]; then
+if [ $NEED_CHIPMUNK = "true" ]; then
-    LOCAL_SHARED_LIBRARIES+=" chipmunk_shared"
+    LOCAL_SHARED_LIBRARIES=$LOCAL_SHARED_LIBRARIES" chipmunk_shared"
 fi
 
-if [ $NEED_LUA == "true" ]; then
+if [ $NEED_LUA = "true" ]; then
-    LOCAL_SHARED_LIBRARIES+=" lua_shared"
+    LOCAL_SHARED_LIBRARIES=$LOCAL_SHARED_LIBRARIES" lua_shared"
 fi
 
 cat > $FILE << EOF
@@ -43,4 +45,4 @@ include \$(BUILD_SHARED_LIBRARY)
 \$(call import-module,cocos2dx/platform/third_party/android/modules/libpng)
 \$(call import-module,cocos2dx/platform/third_party/android/modules/libxml2)
 \$(call import-module,cocos2dx/platform/third_party/android/modules/libjpeg)
-EOF
+EOF
diff --git a/template/android/gamestaticmk.sh b/template/android/gamestaticmk.sh
@@ -1,17 +1,19 @@
+#!/bin/bash
+
 FILE=$1
 NEED_BOX2D=$2
 NEED_CHIPMUNK=$3
 NEED_LUA=$4
 
-if [ $NEED_BOX2D == "true" ];then
+if [ $NEED_BOX2D = "true" ];then
     BOX2D="Box2D"
 fi
 
-if [ $NEED_CHIPMUNK == "true" ]; then
+if [ $NEED_CHIPMUNK = "true" ]; then
     CHIPMUNK="chipmunk"
 fi
 
-if [ $NEED_LUA == "true" ]; then
+if [ $NEED_LUA = "true" ]; then
     LUA="lua/proj.android/jni"
 fi
 
@@ -28,4 +30,4 @@ subdirs := \$(addprefix \$(LOCAL_PATH)/../../../,\$(addsuffix /Android.mk, \\
 subdirs += \$(LOCAL_PATH)/../../Classes/Android.mk \$(LOCAL_PATH)/helloworld/Android.mk
 
 include \$(subdirs)
-EOF
+EOF