mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng15] Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.

Browse Source 
Revised scripts/makefile.freebsd to respect ZLIBDIR and ZLIBINC.
This commit is contained in:
Glenn Randers-Pehrson 2013-02-22 20:54:27 -06:00
parent 6ec5e3ff67
commit ecfc22a681
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.5.15beta07 - February 22, 2013 Libpng 1.5.15beta07 - February 23, 2013
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -62,7 +62,9 @@ Version 1.5.15beta06 [February 22, 2013]
runtime checks runtime checks
Updated the INSTALL document. Updated the INSTALL document.
Version 1.5.15beta07 [February 22, 2013] Version 1.5.15beta07 [February 23, 2013]
Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.
Revised scripts/makefile.freebsd to respect ZLIBDIR and ZLIBINC.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

4
CHANGES
View File

@ -4020,7 +4020,9 @@ Version 1.5.15beta06 [February 22, 2013]
runtime checks runtime checks
Updated the INSTALL document. Updated the INSTALL document.
Version 1.5.15beta07 [February 22, 2013] Version 1.5.15beta07 [February 23, 2013]
Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.
Revised scripts/makefile.freebsd to respect ZLIBDIR and ZLIBINC.
=========================================================================== ===========================================================================
NOTICE November 17, 2012: NOTICE November 17, 2012:

11
INSTALL
View File

@ -46,15 +46,14 @@ to have access to the zlib.h and zconf.h include files that
correspond to the version of zlib that's installed. correspond to the version of zlib that's installed.
If you wish to test with a particular zlib that is not first in the If you wish to test with a particular zlib that is not first in the
standard library search path, put ZLIBLIB, ZLIBINC, INCLUDES, LDFLAGS, standard library search path, put ZLIBLIB, ZLIBINC, CPPFLAGS, LDFLAGS,
LIBS, and LD_LIBRARY_PATH in your environment before running "make test" and LD_LIBRARY_PATH in your environment before running "make test"
or "make distcheck": or "make distcheck":
ZLIBLIB=/path/to/lib export ZLIBLIB ZLIBLIB=/path/to/lib export ZLIBLIB
ZLIBINC=/path/to/include export ZLIBINC ZLIBINC=/path/to/include export ZLIBINC
INCLUDES="-I$ZLIBINC" export INCLUDES CPPFLAGS="-I$ZLIBINC" export CPPFLAGS
LDFLAGS="-L$ZLIBLIB" export LDFLAGS LDFLAGS="-L$ZLIBLIB" export LDFLAGS
LIBS=$ZLIBLIB/libz.a export LIBS
LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH
If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC
@ -67,8 +66,8 @@ If you want to use "cmake" (see www.cmake.org), type
make install make install
You can rename the directories that you downloaded (they You can rename the directories that you downloaded (they
might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.5" might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.7"
or "zlib125") so that you have directories called "zlib" and "libpng". or "zlib127") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this: Your directory structure should look like this:

13
scripts/makefile.freebsd
View File

@ -26,19 +26,24 @@ SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \
libpng/pngconf.h ${INCSDIR}/../pngconf.h \ libpng/pngconf.h ${INCSDIR}/../pngconf.h \
libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h
LDADD+= -lm -lz # where make install finds libz.a and zlib.h
#LDADD+= -lm -lz -lssp_nonshared # for OSVERSION >= 800000 ? ZLIBLIB= /usr/lib
ZLIBINC= /usr/include
LDADD+= -lm -lz
#LDADD+= -lm -lz -lssp_nonshared # for OSVERSION < 800000 ?
DPADD+= ${LIBM} ${LIBZ} DPADD+= ${LIBM} ${LIBZ}
CFLAGS+= -I. CFLAGS+= -I. -I${ZLIBINC}
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c pngwtran.c pngmem.c pngerror.c pngpread.c
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -lpng -lz -lm ${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -L${ZLIBLIB} \
-lpng ${LDADD}
CLEANFILES= pngtest pngtest.o pngout.png CLEANFILES= pngtest pngtest.o pngout.png