Skip to content

V
vlc
Commit e0054371 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contribs: updated libpng patch

parent a5052c2a
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
extras/contrib/src/Makefile
View file @ e0054371
......@@ -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)
......
extras/contrib/src/Patches/libpng-osx.patch
View file @ e0054371
......@@ -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
......
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