cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pngminus: Use the system zlib by default

Browse Source 
If a zlib source tree exists besides the libpng source tree in the
same parent directory, the pngminus build may fail, unless the zlib
tree is built fully. In order to avoid this failing scenario, do not
use the custom-built zlib by default.

(The custom-built zlib is still necessary on platforms that lack a
system-built zlib.)
This commit is contained in:
Cosmin Truta 2019-04-10 22:23:25 -04:00
parent 62a56d4fcc
commit 27e8b99287
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/pngminus/Makefile
View File

@ -11,9 +11,14 @@ PNGINC = -I../..
PNGLIB_SHARED = -L../.. -lpng PNGLIB_SHARED = -L../.. -lpng
PNGLIB_STATIC = ../../libpng.a PNGLIB_STATIC = ../../libpng.a
ZINC = -I../../../zlib # Uncomment the following if you have a custom zlib build at ../../../zlib
ZLIB_SHARED = -L../../../zlib -lz #ZINC = -I../../../zlib
ZLIB_STATIC = ../../../zlib/libz.a #ZLIB_SHARED = -L../../../zlib -lz
#ZLIB_STATIC = ../../../zlib/libz.a
# Use the system zlib otherwise
ZLIB_SHARED = -lz
ZLIB_STATIC = -lz
CPPFLAGS = $(PNGINC) $(ZINC) CPPFLAGS = $(PNGINC) $(ZINC)
CFLAGS = CFLAGS =