Use wxFS_SEEKABLE flag loading images.

[wxWidgets.git] / src / png / scripts / makefile.darwin

diff --git a/src/png/scripts/makefile.darwin b/src/png/scripts/makefile.darwin
index 5ca13827bad766e67e296e18039c01689c1d6c12..f41cd2a4bd13668161d39a1f4c584534893a596f 100644 (file)
--- a/src/png/scripts/makefile.darwin
+++ b/src/png/scripts/makefile.darwin
@@ -1,5 +1,5 @@
 # makefile for libpng on Darwin / Mac OS X
 # makefile for libpng on Darwin / Mac OS X

-# Copyright (C) 2002, 2004, 2006 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2004, 2006, 2008 Glenn Randers-Pehrson

 # Copyright (C) 2001 Christoph Pfisterer
 # derived from makefile.linux:
 #  Copyright (C) 1998, 1999 Greg Roelofs
 # Copyright (C) 2001 Christoph Pfisterer
 # derived from makefile.linux:
 #  Copyright (C) 1998, 1999 Greg Roelofs


@@ -18,8 +18,8 @@ ZLIBINC=../zlib
 
 # Library name:
 LIBNAME = libpng12
 
 # Library name:
 LIBNAME = libpng12

-PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMAJ = 12
+PNGMIN = 1.2.34

 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:


@@ -38,8 +38,8 @@ LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f
 
 RANLIB=ranlib
 RM_F=/bin/rm -f
 

-# CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
-CFLAGS=-I$(ZLIBINC) -Wall -O -funroll-loops
+# CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
+CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops

 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
 
 INCPATH=$(prefix)/include
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
 
 INCPATH=$(prefix)/include


@@ -80,8 +80,11 @@ libpng.a: $(OBJS)
        $(RANLIB) $@
 
 libpng.pc:
        $(RANLIB) $@
 
 libpng.pc:

-       cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! | \
-          sed -e s/-lm// > libpng.pc
+       cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
+       -e s!@exec_prefix@!$(exec_prefix)! \
+       -e s!@libdir@!$(LIBPATH)! \
+       -e s!@includedir@!$(INCPATH)! \
+       -e s!-lpng12!-lpng12\ -lz! > libpng.pc

 
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
 
 libpng-config:
        ( cat scripts/libpng-config-head.in; \


@@ -101,7 +104,7 @@ $(LIBSOMAJ): $(LIBSOVER)
 $(LIBSOVER): $(OBJSDLL)
        $(CC) -dynamiclib \
         -install_name $(LIBPATH)/$(LIBSOMAJ) \
 $(LIBSOVER): $(OBJSDLL)
        $(CC) -dynamiclib \
         -install_name $(LIBPATH)/$(LIBSOMAJ) \

-        -current_version $(PNGVER) -compatibility_version $(PNGVER) \
+        -current_version 0 -compatibility_version 0 \

         -o $(LIBSOVER) \
         $(OBJSDLL) -L$(ZLIBLIB) -lz
 
         -o $(LIBSOVER) \
         $(OBJSDLL) -L$(ZLIBLIB) -lz