add debug and release mode to luajit and openssl in a more elegant way

Author: zilongshanren

build/ios/build.sh

@@ -88,7 +88,7 @@ function contains() {
 }
 
 all_arches=("armv7" "arm64" "i386" "x86_64" "armv7s")
-all_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "box2d" "chipmunk" "freetype2" "jpeg" "protobuf" "tiff" "webp")
+all_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype2" "jpeg"  "tiff" "webp")
 
 # TODO: we only build a fat library with armv7, arm64, i386 and x86_64 arch. If you want to build armv7s into the fat lib, please add it into the following array.
 if [ $build_arches = "all" ]; then
@@ -99,7 +99,7 @@ fi
 
 if [ $build_library = "all" ]; then
     # TODO: more libraries need to be added here
-    declare -a build_library=("png" "zlib" "lua" "luajit" "websockets" "curl" "box2d" "chipmunk" "freetype2" "jpeg" "protobuf" "tiff" "webp")
+    declare -a build_library=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype2" "jpeg" "tiff" "webp")
 else
     build_library=(${build_library//,/ })
 fi
@@ -163,8 +163,8 @@ function create_fat_library()
 
     rm $all_static_libs
 
-    # remove debugging info
-    $STRIP -S $library_name/prebuilt/lib$library_name.a
+    # remove debugging info don't strip
+    # $STRIP -S $library_name/prebuilt/lib$library_name.a
     $LIPO -info $library_name/prebuilt/lib$library_name.a
 }
 
@@ -186,6 +186,10 @@ do
         archive_name=z
     fi
 
+    if [ $lib = "freetype2" ]; then
+        archive_name=freetype
+    fi
+
     mkdir -p $archive_name/prebuilt/
     mkdir -p $archive_name/include/
 
@@ -229,41 +233,44 @@ do
             cp $top_dir/contrib/$install_library_path/$arch/lib/libz.a z/prebuilt/libz-$arch.a
         fi
 
-        if [ $lib = "png" ]; then
+        if [ $lib = "png" ] || [ $lib = "freetype2" ];  then
             echo "copying libz..."
             mkdir -p z/prebuilt/
             cp $top_dir/contrib/$install_library_path/$arch/lib/libz.a z/prebuilt/libz-$arch.a
         fi
 
         echo "Copying needed heder files"
         if [ $lib = "png" ]; then
-            cp  $top_dir/contrib/$install_library_path/$arch/include/png*.h  $library_name/include/
+            cp  $top_dir/contrib/$install_library_path/$arch/include/png*.h  $archive_name/include/
         fi
 
         if [ $lib = "luajit" ]; then
-            cp -r $top_dir/contrib/$install_library_path/$arch/include/luajit-2.0/  $library_name/include/
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/luajit-2.0/  $archive_name/include/
         fi
 
         if [ $lib = "curl" ]; then
-            cp -r $top_dir/contrib/$install_library_path/$arch/include/curl/  $library_name/include/
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/curl/  $archive_name/include/
+        fi
+
+        if [ $lib = "freetype2" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/freetype2  $archive_name/include
         fi
 
         # 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
 
     if [ $lib = "curl" ]; then
         create_fat_library ssl
         create_fat_library crypto
-        create_fat_library z
     fi
 
-    if [ $lib = "png" ]; then
+    if [ $lib = "png" ] || [ $lib = "curl" ] || [ $lib = "freetype2" ]; then
         create_fat_library z
     fi
 

contrib/build_ios.sh

@@ -219,6 +219,7 @@ echo "EXTRA_CFLAGS = ${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "IOS_ARCH := ${ARCH}" >> config.mak
 echo "BUILD_MODE := ${BUILD_MODE}" >> config.mak
+echo "OPTIM := ${OPTIM}" >> config.mak
 
 make fetch
 make list

contrib/build_ios_without_export.sh

@@ -175,6 +175,9 @@ fi
 echo "EXTRA_CFLAGS = ${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "IOS_ARCH := ${ARCH}" >> config.mak
+echo "OPTIM := ${OPTIM}" >> config.mak
+echo "BUILD_MODE := ${BUILD_MODE}" >> config.mak
+
 make fetch
 make list
 make

contrib/src/luajit/rules.mak

@@ -17,12 +17,12 @@ endif
 
 #FIXME: arm64 is not supported
 ifeq ($(IOS_ARCH),armv7)
-LUAJIT_TARGET_FLAGS="-arch armv7 -isysroot $(IOS_SDK)"
+LUAJIT_TARGET_FLAGS="-arch armv7 -isysroot $(IOS_SDK) $(OPTIM)"
 LUAJIT_HOST_CC="gcc -m32 -arch i386"
 endif
 
 ifeq ($(IOS_ARCH),armv7s)
-LUAJIT_TARGET_FLAGS="-arch armv7s -isysroot $(IOS_SDK)"
+LUAJIT_TARGET_FLAGS="-arch armv7s -isysroot $(IOS_SDK) $(OPTIM)"
 LUAJIT_HOST_CC="gcc -m32 -arch i386"
 endif
 
@@ -36,7 +36,7 @@ endif
 
 .luajit: luajit
 ifdef HAVE_ANDROID
-	cd $< && $(MAKE) HOST_CC="gcc -m32" CROSS=$(HOST)- TARGET_SYS=Linux TARGET_FLAGS="${ANDROID_ARCH} ${NDKF}" TARGET_LDFLAGS=$(LUAJIT_LDFLAGS)
+	cd $< && $(MAKE) HOST_CC="gcc -m32 $(OPTIM)" CROSS=$(HOST)- TARGET_SYS=Linux TARGET_FLAGS="${ANDROID_ARCH} ${NDKF}" TARGET_LDFLAGS=$(LUAJIT_LDFLAGS)
 endif
 ifdef HAVE_MACOSX
 	cd $< && $(MAKE) HOST_CC="$(CC)" HOST_CFLAGS="$(CFLAGS)"
@@ -49,7 +49,7 @@ ifeq ($(IOS_ARCH),armv7s)
 	cd $< && make HOST_CC=$(LUAJIT_HOST_CC) TARGET_FLAGS=$(LUAJIT_TARGET_FLAGS) TARGET=arm TARGET_SYS=iOS
 endif
 ifeq ($(IOS_ARCH),i386)
-	cd $< && make CC="gcc -m32 -arch i386"
+	cd $< && make CC="gcc -m32 -arch i386 $(OPTIM)"
 endif
 endif
 	cd $< && make install PREFIX=$(PREFIX)

contrib/src/openssl/rules.mak

@@ -50,15 +50,10 @@ endif
 	cd $< && $(HOSTVARS)  ./Configure $(OPENSSL_CONFIG_VARS)  --prefix=$(PREFIX) $(OPENSSL_COMPILER)
 ifdef HAVE_IOS
 	cd $< && perl -i -pe "s|^CC= xcrun clang|CC= xcrun cc -arch ${IOS_ARCH} -miphoneos-version-min=6.0 |g" Makefile
-ifeq ($(BUILD_MODE),release)
-	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${IOS_SDK} -O3 -DNDEBUG |g" Makefile
-endif
-ifeq ($(BUILD_MODE),debug)
-	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${IOS_SDK} -O0 -g -DNDEBUG |g" Makefile
-endif
+	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${IOS_SDK} ${OPTIM} |g" Makefile
 endif
 ifdef HAVE_ANDROID
-	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= ${ANDROID_ARCH} -O3 |g" Makefile
+	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= ${ANDROID_ARCH} ${OPTIM} |g" Makefile
 endif
 	cd $< && $(MAKE) install
 	touch $@