generate fat library for png on ios

Author: zilongshanren

build/ios/build_png.sh

@@ -71,16 +71,16 @@ $LIPO -create $library_name/prebuilt/lib$library_name-armv7.a \
       $library_name/prebuilt/lib$library_name-i386.a \
       $library_name/prebuilt/lib$library_name-arm64.a \
       $library_name/prebuilt/lib$library_name-x86_64.a \
-      -output $library_name/prebuilt/libluajit.a
+      -output $library_name/prebuilt/lib$library_name.a
 
-# rm $library_name/prebuilt/lib$library_name-armv7.a
-# rm $library_name/prebuilt/lib$library_name-i386.a
-# rm $library_name/prebuilt/lib$library_name-arm64.a
-# rm $library_name/prebuilt/lib$library_name-x86_64.a
+rm $library_name/prebuilt/lib$library_name-armv7.a
+rm $library_name/prebuilt/lib$library_name-i386.a
+rm $library_name/prebuilt/lib$library_name-arm64.a
+rm $library_name/prebuilt/lib$library_name-x86_64.a
 
 
 #remove debugging info
-$STRIP -S $library_name/prebuilt/libluajit.a
-$LIPO -info $library_name/prebuilt/libluajit.a
+$STRIP -S $library_name/prebuilt/lib$library_name.a
+$LIPO -info $library_name/prebuilt/lib$library_name.a
 
 

contrib/src/png/rules.mak

@@ -16,9 +16,6 @@ $(TARBALLS)/libpng-$(PNG_VERSION).tar.xz:
 
 png: libpng-$(PNG_VERSION).tar.xz .sum-png
 	$(UNPACK)
-	$(APPLY) $(SRC)/png/winrt.patch
-	$(APPLY) $(SRC)/png/bins.patch
-	$(APPLY) $(SRC)/png/automake.patch
 	$(MOVE)
 
 DEPS_png = zlib $(DEPS_zlib)

contrib/src/zlib/rules.mak

@@ -20,6 +20,10 @@ ifdef HAVE_TIZEN
 EX_ECFLAGS = -fPIC
 endif
 
+ifdef HAVE_WIN32
+extra_makefile=-fwin32/Makefile.gcc
+endif
+
 $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
 	$(call download,$(ZLIB_URL))
 
@@ -30,6 +34,11 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
 	$(MOVE)
 
 .zlib: zlib
+ifndef HAVE_WIN32
 	cd $< && $(HOSTVARS) $(ZLIB_CONFIG_VARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" ./configure --prefix=$(PREFIX) --static
 	cd $< && $(MAKE) install
+endif
+ifdef HAVE_WIN32
+	cd $< && make -fwin32/Makefile.gcc BINARY_PATH=$(PREFIX)/bin INCLUDE_PATH=$(PREFIX)/include LIBRARY_PATH=$(PREFIX)/lib install
+endif
 	touch $@