Skip to content

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

Updated for current release

parent ed207a94
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
extras/contrib/src/Patches/libpng-osx.patch
View file @ aa8b3425
diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin --- libpng/scripts/makefile.darwin.orig 2008-05-08 13:58:09.000000000 +0200
--- libpng-1.2.12/scripts/makefile.darwin 2006-06-27 22:22:40.000000000 +0200 +++ libpng/scripts/makefile.darwin 2008-05-24 02:01:02.000000000 +0200
+++ libpng/scripts/makefile.darwin 2006-12-08 18:15:36.000000000 +0100
@@ -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
# where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h # where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h
-prefix=/usr/local -prefix=/usr/local
+prefix=??PREFIX?? +prefix=/Users/fpk/Desktop/vlc/extras/contrib
exec_prefix=$(prefix) exec_prefix=$(prefix)
# Where the zlib library and include files are located # Where the zlib library and include files are located
...@@ -21,18 +20,18 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin ...@@ -21,18 +20,18 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
# Library name: # Library name:
LIBNAME = libpng12 LIBNAME = libpng12
@@ -38,8 +38,8 @@ @@ -39,8 +39,8 @@
RANLIB=ranlib
RM_F=/bin/rm -f RM_F=/bin/rm -f
-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops # CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
-CFLAGS=-I$(ZLIBINC) -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) -Wall -O3 -funroll-loops
+LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz +LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib LIBPATH=$(exec_prefix)/lib
@@ -72,7 +72,7 @@ @@ -73,7 +73,7 @@
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) -fno-common -o $@ $*.c $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
...@@ -41,7 +40,7 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin ...@@ -41,7 +40,7 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)
@@ -178,7 +178,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