add debug/release option

Author: zilongshanren

build/ios/build.sh

@@ -210,7 +210,7 @@ do
         fi
 
         echo "build $arch for $lib"
-        $top_dir/contrib/$build_script_name $is_simulator -a $arch -l $library_name
+        $top_dir/contrib/$build_script_name $is_simulator -a $arch -l $library_name -m $build_mode
 
         cp $top_dir/contrib/$install_library_path/$arch/lib/lib$archive_name.a $archive_name/prebuilt/lib$archive_name-$arch.a
         # FIXME: some archive names have some postfix in it.
@@ -246,8 +246,8 @@ do
         # TODO: add more header files decides here
 
         echo "cleaning up"
-        # rm -rf $top_dir/contrib/$install_library_path
-        # rm -rf $top_dir/contrib/$build_library_path-$arch
+        rm -rf $top_dir/contrib/$install_library_path
+        rm -rf $top_dir/contrib/$build_library_path-$arch
     done
 
     create_fat_library $archive_name

contrib/build_ios.sh

@@ -8,6 +8,7 @@ SDK_VERSION=$(xcodebuild -showsdks | grep iphoneos | sort | tail -n 1 | awk '{pr
 # FIXME: why min deploy target can't use 5.1.1
 SDK_MIN=6.0
 ARCH=armv7
+BUILD_MODE=release
 
 # TODO: configure to compile speficy 3rd party libraries
 OPTIONS=""
@@ -16,13 +17,14 @@ OPTIONS=""
 usage()
 {
 cat << EOF
-usage: $0 [-s] [-k sdk] [-a arch] [-l libname]
+usage: $0 [-s] [-k sdk] [-a arch] [-l libname] [-m biuld mode]
 
 OPTIONS
    -k <sdk version>      Specify which sdk to use ('xcodebuild -showsdks', current: ${SDK_VERSION})
    -s            Build for simulator
    -a <arch>     Specify which arch to use (current: ${ARCH})
    -l <libname>  Specify which static library to build
+   -m <build mode> Specify release or debug mode(current: ${BUILD_MODE})
 EOF
 }
 
@@ -44,7 +46,7 @@ info()
 }
 
 
-while getopts "hvsk:a:l:" OPTION
+while getopts "hvsk:a:l:m:" OPTION
 do
      case $OPTION in
          h)
@@ -66,6 +68,8 @@ do
          l)
              OPTIONS=--enable-$OPTARG
              ;;
+         m)  BUILD_MODE=$OPTARG
+             ;;
          ?)
              usage
              exit 1
@@ -98,10 +102,16 @@ info "Building cocos2d-x third party libraries for iOS"
 
 if [ "$PLATFORM" = "Simulator" ]; then
     TARGET="${ARCH}-apple-darwin"
-    OPTIM="-O3 -g"
 else
     TARGET="arm-apple-darwin"
-    OPTIM="-O3 -g"
+fi
+
+if [ $BUILD_MODE = "release" ]; then
+    OPTIM="-O3 -DNDEBUG"
+fi
+
+if [ $BUILD_MODE = "debug" ]; then
+    OPTIM="-O0 -g -DDEBUG"
 fi
 
 info "Using ${ARCH} with SDK version ${SDK_VERSION}"

contrib/build_ios_without_export.sh

@@ -8,6 +8,7 @@ SDK_VERSION=$(xcodebuild -showsdks | grep iphoneos | sort | tail -n 1 | awk '{pr
 # FIXME: why min deploy target can't use 5.1.1
 SDK_MIN=6.0
 ARCH=armv7
+BUILD_MODe=release
 
 # TODO: configure to compile speficy 3rd party libraries
 OPTIONS=""
@@ -16,13 +17,14 @@ OPTIONS=""
 usage()
 {
 cat << EOF
-usage: $0 [-s] [-k sdk] [-a arch] [-l libname]
+usage: $0 [-s] [-k sdk] [-a arch] [-l libname] [-m build mode]
 
 OPTIONS
    -k <sdk version>      Specify which sdk to use ('xcodebuild -showsdks', current: ${SDK_VERSION})
    -s            Build for simulator
    -a <arch>     Specify which arch to use (current: ${ARCH})
    -l <libname>  Specify which static library to build
+   -m <build mode> Specify release or debug mode(current: ${BUILD_MODE})
 EOF
 }
 
@@ -44,7 +46,7 @@ info()
 }
 
 
-while getopts "hvsk:a:l:" OPTION
+while getopts "hvsk:a:l:m:" OPTION
 do
      case $OPTION in
          h)
@@ -66,6 +68,8 @@ do
          l)
              OPTIONS=--enable-$OPTARG
              ;;
+         m)  BUILD_MODE=$OPTARG
+             ;;
          ?)
              usage
              exit 1
@@ -98,10 +102,16 @@ info "Building cocos2d-x third party libraries for iOS"
 
 if [ "$PLATFORM" = "Simulator" ]; then
     TARGET="${ARCH}-apple-darwin"
-    OPTIM="-O3 -g"
 else
     TARGET="arm-apple-darwin"
-    OPTIM="-O3 -g"
+fi
+
+if [ $BUILD_MODE = "release" ]; then
+    OPTIM="-O3"
+fi
+
+if [ $BUILD_MODE = "debug" ]; then
+    OPTIM="-O0 -g"
 fi
 
 info "Using ${ARCH} with SDK version ${SDK_VERSION}"

contrib/src/main.mak

@@ -109,11 +109,11 @@ RANLIB=xcrun ranlib
 # EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
 # EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
 ifeq ($(ARCH),x86_64)
-EXTRA_CFLAGS += -m64 -O3 -DNDEBUG
-EXTRA_LDFLAGS += -m64 -O3 -DNDEBUG
+EXTRA_CFLAGS += -m64
+EXTRA_LDFLAGS += -m64
 else
-EXTRA_CFLAGS += -m32 -O3 -DNDEBUG
-EXTRA_LDFLAGS += -m32 -O3 -DNDEBUG
+EXTRA_CFLAGS += -m32
+EXTRA_LDFLAGS += -m32
 endif
 
 XCODE_FLAGS = -sdk macosx$(OSX_VERSION)
@@ -165,8 +165,8 @@ cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
 
 EXTRA_CFLAGS += -I$(PREFIX)/include
 CPPFLAGS := $(CPPFLAGS) $(EXTRA_CFLAGS)
-CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS) -g
-CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS) -g
+CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS)
+CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS)
 EXTRA_LDFLAGS += -L$(PREFIX)/lib
 LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS)
 # Do not export those! Use HOSTVARS.