add gas-preprocessor.pl to the build system

Author: zilongshanren

build_ios.sh

@@ -80,10 +80,10 @@ fi
 info "Building cocos2d-x third party libraries for iOS"
 
 if [ "$PLATFORM" = "Simulator" ]; then
-    TARGET="${ARCH}-apple-darwin14"
+    TARGET="${ARCH}-apple-darwin11"
     OPTIM="-O3 -g"
 else
-    TARGET="arm-apple-darwin14"
+    TARGET="arm-apple-darwin11"
     OPTIM="-O3 -g"
 fi
 
@@ -116,7 +116,7 @@ export PATH="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin"
 # info "Building tools"
 # spushd "${COCOSROOT}/contrib/ios"
 # ./bootstrap
-# make 
+# make
 # spopd
 
 info "Building contrib for iOS in '${COCOSROOT}/contrib/iPhone${PLATFORM}-${ARCH}'"
@@ -179,18 +179,20 @@ cd "${COCOSROOT}/contrib/iPhone${PLATFORM}-${ARCH}"
 
 ## FIXME: do we need to replace Apple's gas?
 if [ "$PLATFORM" = "OS" ]; then
-    # export AS="gas-preprocessor.pl ${CC}"
-    # export ASCPP="gas-preprocessor.pl ${CC}"
-    # export CCAS="gas-preprocessor.pl ${CC}"
+    export AS="gas-preprocessor.pl ${CC}"
+    export ASCPP="gas-preprocessor.pl ${CC}"
+    export CCAS="gas-preprocessor.pl ${CC}"
     if [ "$ARCH" = "arm64" ]; then
         export GASPP_FIX_XCODE5=1
     fi
 else
     export ASCPP="xcrun as"
 fi
 
-../bootstrap --build=x86_64-apple-darwin14 --host=${TARGET} --prefix=${COCOSROOT}/contrib/${TARGET}-${ARCH} \
+# # FIXME: add more convenient
+../bootstrap --build=x86_64-apple-darwin11 --host=${TARGET} --prefix=${COCOSROOT}/contrib/${TARGET}-${ARCH} \
     --disable-lua \
+    --disable-freetype2 \
     --enable-png > ${out}
 
 echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak

contrib/bootstrap

@@ -240,7 +240,7 @@ case "${OS}" in
 			add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
 		else
 			check_ios_sdk
-			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
+			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"  "HAVE_ARMV7A" "HAVE_NEON"
 		fi
 		;;
 	*bsd*)

contrib/src/main.mak

@@ -13,7 +13,7 @@ TOPDST ?= ..
 SRC := $(TOPSRC)/src
 TARBALLS := $(TOPSRC)/tarballs
 
-PATH :=$(abspath ../../extras/tools/build/bin):$(PATH)
+PATH :=$(abspath ../../extras/tools/bin):$(PATH)
 export PATH
 
 PKGS_ALL := $(patsubst $(SRC)/%/rules.mak,%,$(wildcard $(SRC)/*/rules.mak))
@@ -129,7 +129,7 @@ ifdef HAVE_IOS
 CC=xcrun clang
 CXX=xcrun clang++
 ifdef HAVE_NEON
-AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
+AS=perl $(abspath ../../extras/tools/bin/gas-preprocessor.pl) $(CC)
 CCAS=gas-preprocessor.pl $(CC) -c
 else
 CCAS=$(CC) -c

contrib/src/png/rules.mak

@@ -8,8 +8,8 @@ PKGS_FOUND += png
 endif
 
 $(TARBALLS)/libpng-$(PNG_VERSION).tar.xz:
-	libpng16..a	     $(call download,$(PNG_URL))
-				   
+	$(call download,$(PNG_URL))
+
 .sum-png: libpng-$(PNG_VERSION).tar.xz
 
 png: libpng-$(PNG_VERSION).tar.xz .sum-png