add more options to build_png

Author: zilongshanren

build/ios/build.sh

@@ -207,8 +207,8 @@ fi
         --host=${TARGET} \
         --prefix=${PREFIX} > ${out}
 
-echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
-echo "EXTRA_LDFLAGS += ${EXTRA_LDFLAGS}" >> config.mak
+echo "EXTRA_CFLAGS = ${EXTRA_CFLAGS}" >> config.mak
+echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "IOS_ARCH := ${ARCH}" >> config.mak
 make fetch
 make list

build/ios/build_png.sh

@@ -1,3 +1,87 @@
+#!/bin/sh
+
+#
+# A script to build png static library for iOS
+#
+
+build_arches="all"
+build_mode="release"
+
+function usage()
+{
+    echo "You should follow the instructions here to build static library for iOS"
+    echo "If you want to build a fat, you should pass 'all' to --arch param"
+    echo ""
+    echo "./build_png.sh"
+    echo "\t-h --help"
+    echo "\t--arch=[all | armv7,arm64,i386,x86_64]"
+    echo "\t--mode=[release | debug]"
+    echo ""
+}
+
+
+while [ "$1" != "" ]; do
+    PARAM=`echo $1 | awk -F= '{print $1}'`
+    VALUE=`echo $1 | awk -F= '{print $2}'`
+    case $PARAM in
+        -h | --help)
+            usage
+            exit
+            ;;
+        --arch)
+            build_arches=$VALUE
+            ;;
+        --mode)
+            build_mode=$VALUE
+            ;;
+        *)
+            echo "ERROR: unknown parameter \"$PARAM\""
+            usage
+            exit 1
+            ;;
+    esac
+    shift
+done
+
+# 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
+    declare -a build_arches=( "armv7" "arm64" "i386" "x86_64" )
+else
+    build_arches=(${build_arches//,/ })
+fi
+
+#check invalid arch type
+function check_invalid_arch_type()
+{
+    for arch in "${build_arches[@]}"
+    do
+        if [ $arch != "armv7" ] && [ $arch != "arm64" ] && [ $arch != "armv7s" ] && [ $arch != "i386" ] && [ $arch != "x86_64" ]; then
+            echo "Invalid arch! Only armv7, armv7s, arm64, i386 and x86_64 is acceptable."
+            exit 1
+        fi
+    done
+}
+
+check_invalid_arch_type
+
+#check invalid build mode, only debug and release is acceptable
+if [ $build_mode != "release" ] && [ $build_mode != "debug" ]; then
+    echo "invalid build mode, only: debug and release is acceptabl"
+    usage
+    exit
+fi
+
+
+for arch in "${build_arches[@]}"
+do
+    echo $arch
+done
+
+echo "build mode is $build_mode"
+
+exit
+
+
 current_dir=`pwd`
 library_name=png
 rm -rf $library_name
@@ -82,5 +166,3 @@ rm $library_name/prebuilt/lib$library_name-x86_64.a
 #remove debugging info
 $STRIP -S $library_name/prebuilt/lib$library_name.a
 $LIPO -info $library_name/prebuilt/lib$library_name.a
-
-

build/ios/build_without_export.sh

@@ -162,8 +162,8 @@ fi
         --host=${TARGET} \
         --prefix=${PREFIX} > ${out}
 
-echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
-echo "EXTRA_LDFLAGS += ${EXTRA_LDFLAGS}" >> config.mak
+echo "EXTRA_CFLAGS = ${EXTRA_CFLAGS}" >> config.mak
+echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "IOS_ARCH := ${ARCH}" >> config.mak
 make fetch
 make list