From 7ecef0d2793457cfbe44fb9984df44e161833111 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Mon, 19 Feb 2018 01:53:42 +0100
Subject: [PATCH] 3rdparty: add libz as well, and make libpng use it

---
 .travis.yml         |  1 +
 3rdparty/.gitignore |  1 +
 3rdparty/Makefile   | 26 ++++++++++++++++++++++----
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c11e5576..e7f8f6a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ addons:
   apt:
     packages:
     - gcc-mingw-w64-i686
+    - mingw-w64-tools
     - libsdl1.2-dev
     - libsdl-image1.2-dev
     - libsdl-ttf2.0-dev
diff --git a/3rdparty/.gitignore b/3rdparty/.gitignore
index 9df73044..de7cfba8 100644
--- a/3rdparty/.gitignore
+++ b/3rdparty/.gitignore
@@ -5,3 +5,4 @@ SDL_image*/
 jpeg-*/
 libpng-*/
 tiff-*/
+zlib-*/
diff --git a/3rdparty/Makefile b/3rdparty/Makefile
index 2c1f3de7..6e5b6e7f 100644
--- a/3rdparty/Makefile
+++ b/3rdparty/Makefile
@@ -14,6 +14,9 @@ JPEGURL = http://www.ijg.org/files/$(JPEGARCH)
 LIBTIFF = tiff-v3.4
 LIBTIFFARCH = $(LIBTIFF)-tar.gz
 LIBTIFFURL = ftp://ftp.sgi.com/graphics/tiff/$(LIBTIFFARCH)
+ZLIB=zlib-1.2.11
+ZLIBARCH=$(ZLIB).tar.gz
+ZLIBURL=https://www.zlib.net/$(ZLIBARCH)
 # https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-0.6.1.tar.gz
 
 PREFIX = $(PWD)/usr
@@ -36,12 +39,12 @@ endif
 HOST = $(shell $(CC) -dumpmachine)
 #HOST = i686-pc-mingw32
 
-.PHONY:	all clean libs libpng libsdl libsdl_image libjpeg libtiff
+.PHONY:	all clean libs libpng libsdl libsdl_image libjpeg libtiff zlib
 
 all:	libs
 
 clean:
-	$(RM) -r archives $(LIBPNG)
+	$(RM) -r archives $(LIBPNG) $(ZLIB) $(SDLIMAGE) $(JPEGDIR) $(LIBTIFF)
 
 libs:	libpng libsdl libsdl_image
 libsdl:	$(PREFIX)/lib/libSDLmain.a
@@ -49,6 +52,7 @@ libsdl_image:	$(PREFIX)/lib/libSDL_image.a
 libjpeg:	$(PREFIX)/lib/libjpeg.a
 libpng:	$(PREFIX)/lib/libpng.a
 libtiff:	$(PREFIX)/lib/libtiff.a
+zlib:	$(PREFIX)/lib/libz.a
 
 $(PREFIX)/lib/libSDLmain.a:	archives/$(SDLDEVEL)
 	$(TAR) xzf $<
@@ -60,7 +64,7 @@ $(PREFIX)/lib/libSDL_image.a:	$(PREFIX)/lib/libtiff.a
 $(PREFIX)/lib/libSDL_image.a:	$(PREFIX)/lib/libpng.a
 
 $(PREFIX)/lib/libSDL_image.a:	$(SDLIMAGE)/.ok
-	cd $(SDLIMAGE) && CC=$(CC) CFLAGS=-I$(PREFIX)/include LDFLAGS=-L$(PREFIX)/lib LIBPNG_CFLAGS= LIBPNG_LIBS=-lpng ./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) --host=$(HOST) --disable-webp
+	cd $(SDLIMAGE) && CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS=-L$(PREFIX)/lib LIBPNG_CFLAGS= LIBPNG_LIBS=-lpng ./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) --host=$(HOST) --disable-webp
 	cd $(SDLIMAGE) && $(MAKE)
 	cd $(SDLIMAGE) && $(MAKE) install
 
@@ -93,8 +97,10 @@ $(LIBTIFF)/.ok:	archives/$(LIBTIFFARCH)
 	$(TAR) xzf $<
 	touch $@
 	
+$(PREFIX)/lib/libpng.a:	$(PREFIX)/lib/libz.a
+
 $(PREFIX)/lib/libpng.a:	$(LIBPNG)/.ok
-	cd $(LIBPNG) && CC=$(CC) ./configure --prefix=$(PREFIX) --host=$(HOST)
+	cd $(LIBPNG) && CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS=-L$(PREFIX)/lib ./configure --prefix=$(PREFIX) --host=$(HOST)
 	cd $(LIBPNG) && $(MAKE)
 	cd $(LIBPNG) && $(MAKE) install
 
@@ -102,6 +108,14 @@ $(LIBPNG)/.ok:	archives/$(LIBPNGARCH)
 	$(TAR) xzf $<
 	touch $@
 
+$(PREFIX)/lib/libz.a:	$(ZLIB)/.ok
+	cd $(ZLIB) && $(MAKE) -fwin32/Makefile.gcc PREFIX=$(shell echo $(CC) | sed 's/^\(.*\)gcc/\1/')
+	cd $(ZLIB) && INCLUDE_PATH=$(PREFIX)/include LIBRARY_PATH=$(PREFIX)/lib BINARY_PATH=$(PREFIX)/bin $(MAKE) install -fwin32/Makefile.gcc SHARED_MODE=1
+
+$(ZLIB)/.ok:	archives/$(ZLIBARCH)
+	$(TAR) xzf $<
+	touch $@
+
 archives/$(LIBPNGARCH):
 	@$(MKDIR) $(@D)
 	cd $(@D) && $(GETURL) $(LIBPNGURL)
@@ -121,3 +135,7 @@ archives/$(JPEGARCH):
 archives/$(LIBTIFFARCH):
 	@$(MKDIR) $(@D)
 	cd $(@D) && $(GETURL) $(LIBTIFFURL)
+
+archives/$(ZLIBARCH):
+	@$(MKDIR) $(@D)
+	cd $(@D) && $(GETURL) $(ZLIBURL)