From e0054371918b5ca98aee48920423eca073875c50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Sun, 24 Jan 2010 23:59:40 +0100 Subject: [PATCH] contribs: updated libpng patch --- extras/contrib/src/Makefile | 2 +- extras/contrib/src/Patches/libpng-osx.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index fb10c7dbd4..987e79bcef 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -1231,7 +1231,7 @@ ifdef HAVE_WINCE (cd $<;./genMakefiles mingw && make $(HOSTCC)) else ifdef HAVE_DARWIN_OS - (cd $<; sed -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%cc%$(CC)\ $(EXTRA_LDFLAGS)%' -e 's%c++%$(CXX)%' -i.orig config.macosx) + (cd $<; sed -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%cc%$(CC)%' -e 's%c++%$(CXX)\ $(EXTRA_LDFLAGS)%' -i.orig config.macosx) (cd $<; ./genMakefiles macosx && make) else (cd $<; sed -e 's/=/= EXTRA_CPPFLAGS/' -e 's%EXTRA_CPPFLAGS%-I/include%' -i.orig groupsock/Makefile.head) diff --git a/extras/contrib/src/Patches/libpng-osx.patch b/extras/contrib/src/Patches/libpng-osx.patch index 0c18003639..bf31f47ce1 100644 --- a/extras/contrib/src/Patches/libpng-osx.patch +++ b/extras/contrib/src/Patches/libpng-osx.patch @@ -25,7 +25,7 @@ diff -urN libpng-1.2.41/scripts/makefile.darwin libpng/scripts/makefile.darwin 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 +CFLAGS=-DPNG_CONFIGURE_LIBPNG ??EXTRA_CFLAGS?? -I$(ZLIBINC) -W -Wall -O -funroll-loops +LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz -- 2.39.2