Commit 9eb047da authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

contribs: update libpng patch for OSX

parent ce718de2
diff -ruN libpng-1.2.20/scripts/makefile.darwin libpng/scripts/makefile.darwin diff -ruN libpng-1.2.30/scripts/makefile.darwin libpng/scripts/makefile.darwin
--- libpng-1.2.20/scripts/makefile.darwin 2007-09-08 05:23:01.000000000 +0200 --- libpng-1.2.30/scripts/makefile.darwin 2008-08-15 16:14:44.000000000 +0200
+++ libpng/scripts/makefile.darwin 2007-09-23 15:31:21.000000000 +0200 +++ libpng/scripts/makefile.darwin 2008-08-20 01:48:40.000000000 +0200
@@ -7,14 +7,14 @@ @@ -7,14 +7,14 @@
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
...@@ -24,10 +24,10 @@ diff -ruN libpng-1.2.20/scripts/makefile.darwin libpng/scripts/makefile.darwin ...@@ -24,10 +24,10 @@ diff -ruN libpng-1.2.20/scripts/makefile.darwin libpng/scripts/makefile.darwin
@@ -39,8 +39,8 @@ @@ -39,8 +39,8 @@
RM_F=/bin/rm -f RM_F=/bin/rm -f
# CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
-CFLAGS=-I$(ZLIBINC) -Wall -O -funroll-loops -CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
+CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -Wall -O3 -funroll-loops +CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -W -Wall -O -funroll-loops
+LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz +LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
...@@ -41,7 +41,7 @@ diff -ruN libpng-1.2.20/scripts/makefile.darwin libpng/scripts/makefile.darwin ...@@ -41,7 +41,7 @@ diff -ruN libpng-1.2.20/scripts/makefile.darwin libpng/scripts/makefile.darwin
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)
@@ -179,7 +179,7 @@ @@ -182,7 +182,7 @@
chmod 755 $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config
(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment