contrib: Use the official zlib Win32 build system

We don't actually need to patch or use the configure script. By properly passing the Makefile variables, instead of environement variables, we can use the official Win32 build system for zlib. Signed-off-by: Derek Buitenhuis <[email protected]> Signed-off-by: Jean-Baptiste Kempf <[email protected]>
EDFBoy · May 20, 2016 · 10afba3 · 10afba3
1 parent 0fd1caa
commit 10afba3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/contrib/src/zlib/mingw.patch b/contrib/src/zlib/mingw.patch
diff --git a/contrib/src/zlib/rules.mak b/contrib/src/zlib/rules.mak
@@ -24,12 +24,14 @@ $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
 
 zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
 	$(UNPACK)
-ifdef HAVE_WIN32
-	$(APPLY) $(SRC)/zlib/mingw.patch
-endif
 	$(MOVE)
 
 .zlib: zlib
+ifdef HAVE_WIN32
+	cd $< && $(HOSTVARS) $(MAKE) -fwin32/Makefile.gcc $(HOSTVARS) $(ZLIB_CONFIG_VARS) CFLAGS="$(CFLAGS) $(ZLIB_ECFLAGS)" RC="$(HOST)-windres" LD="$(CC)"
+	cd $< && $(MAKE) -fwin32/Makefile.gcc install INCLUDE_PATH="$(PREFIX)/include" LIBRARY_PATH="$(PREFIX)/lib" BINARY_PATH="$(PREFIX)/bin"
+else
 	cd $< && $(HOSTVARS) $(ZLIB_CONFIG_VARS) CFLAGS="$(CFLAGS) $(ZLIB_ECFLAGS)" ./configure --prefix=$(PREFIX) --static
 	cd $< && $(MAKE) install
+endif
 	touch $@