From fec6a4ca4e1ceb85891c5f1ca50b45c9dc3e684d Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 4 Dec 2009 08:26:21 -0600 Subject: [PATCH] [master] Removed leftover "-DPNG_CONFIGURE_LIBPNG" from scripts/makefile.darwin --- ANNOUNCE | 1 + CHANGES | 1 + scripts/makefile.darwin | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ANNOUNCE b/ANNOUNCE index 6f486c3b3..92093a047 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -50,6 +50,7 @@ version 1.2.42beta01 [December 4, 2009] instead of in $prefix/include/libpng. Also revised makefile.sco to put them in $prefix/include/libpng12 instead of in $prefix/include/libpng/libpng12. + Removed leftover "-DPNG_CONFIGURE_LIBPNG" from scripts/makefile.darwin Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CHANGES b/CHANGES index d9ccd04a2..3ba3b9bf0 100644 --- a/CHANGES +++ b/CHANGES @@ -2613,6 +2613,7 @@ version 1.2.42 [December 4, 2009] instead of in $prefix/include/libpng. Also revised makefile.sco to put them in $prefix/include/libpng12 instead of in $prefix/include/libpng/libpng12. + Removed leftover "-DPNG_CONFIGURE_LIBPNG" from scripts/makefile.darwin Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 17a4c824d..d6060d269 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -42,7 +42,7 @@ RANLIB=ranlib RM_F=/bin/rm -f # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O -funroll-loops +CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz INCPATH=$(prefix)/include