diff --git a/ANNOUNCE b/ANNOUNCE index 9f789f383..f324c2557 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -517,6 +517,7 @@ Version 1.6.0beta30 [September 27, 2012] Added a work around for GCC 4.2 optimization bug. Marked the broken (bad white point) original HP sRGB profiles correctly and correct comments. + Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7 Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 2a403d4f5..cc91a400d 100644 --- a/CHANGES +++ b/CHANGES @@ -4269,6 +4269,7 @@ Version 1.6.0beta30 [September 27, 2012] Added a work around for GCC 4.2 optimization bug. Marked the broken (bad white point) original HP sRGB profiles correctly and correct comments. + Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7 Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/contrib/pngminim/decoder/makefile b/contrib/pngminim/decoder/makefile index e10e1225d..dafba64b7 100644 --- a/contrib/pngminim/decoder/makefile +++ b/contrib/pngminim/decoder/makefile @@ -14,7 +14,7 @@ LD=$(CC) RM=rm -f COPY=cp -CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -I. -O1 +CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DZ_SOLO -DNO_GZIP -I. -O1 C=.c O=.o diff --git a/contrib/pngminim/encoder/makefile b/contrib/pngminim/encoder/makefile index d6f39e2ea..810b8c8fa 100644 --- a/contrib/pngminim/encoder/makefile +++ b/contrib/pngminim/encoder/makefile @@ -14,7 +14,7 @@ LD=$(CC) RM=rm -f COPY=cp -CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -I. -O1 +CFLAGS=-DPNG_USER_CONFIG -DZ_SOLO -DNO_GZIP -I. -O1 C=.c O=.o diff --git a/contrib/pngminim/preader/makefile b/contrib/pngminim/preader/makefile index f4b0ccdc8..ecc05c7bf 100644 --- a/contrib/pngminim/preader/makefile +++ b/contrib/pngminim/preader/makefile @@ -30,7 +30,7 @@ XLIB = -L/usr/X11R6/lib -lX11 #LIBS = $(XLIB) LIBS = $(XLIB) -lm #platforms that need libm -CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -I. $(XINC) -O1 +CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DZ_SOLO -DNO_GZIP -I. $(XINC) -O1 C=.c O=.o