summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-05-25 15:23:14 (GMT)
committerGitHub <noreply@github.com>2017-05-25 15:23:14 (GMT)
commit42b3dde819df3ce54c5ee2c694d8daa0594056d0 (patch)
treec996f6f05a1558f376453a2a80623e85f448177d /patches
parentf975aea2f8bc76f020bc6bc7a3733940ec95da88 (diff)
parent20a8525e8bafb4a66f43bb1486ece439e3e0d95d (diff)
Merge pull request #722 from stilor/mingw-host
Mingw host
Diffstat (limited to 'patches')
-rw-r--r--patches/zlib/1.2.11/120-mingw-static-only.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/zlib/1.2.11/120-mingw-static-only.patch b/patches/zlib/1.2.11/120-mingw-static-only.patch
new file mode 100644
index 0000000..9eef00b
--- /dev/null
+++ b/patches/zlib/1.2.11/120-mingw-static-only.patch
@@ -0,0 +1,25 @@
+diff -urpN zlib-1.2.11.orig/win32/Makefile.gcc zlib-1.2.11/win32/Makefile.gcc
+--- zlib-1.2.11.orig/win32/Makefile.gcc 2017-05-23 18:52:07.937730080 -0700
++++ zlib-1.2.11/win32/Makefile.gcc 2017-05-23 19:02:24.068666463 -0700
+@@ -71,7 +71,11 @@ OBJS = adler32.o compress.o crc32.o defl
+ gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+ OBJA =
+
+-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe
++all: $(STATICLIB) example.exe minigzip.exe
++
++ifeq ($(SHARED_MODE),1)
++all: $(SHAREDLIB) $(IMPLIB) example_d.exe minigzip_d.exe
++endif
+
+ test: example.exe minigzip.exe
+ ./example
+@@ -125,7 +129,7 @@ zlibrc.o: win32/zlib1.rc
+ .PHONY: install uninstall clean
+
+ install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)
+- @if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \
++ @if test -z "$(INCLUDE_PATH)" -o -z "$(LIBRARY_PATH)" -o -z "$(BINARY_PATH)"; then \
+ echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \
+ exit 1; \
+ fi