Fix recursion problems when loading pages from a virtual file system using the WebKit...

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

diff --git a/src/png/scripts/makefile.ne12bsd b/src/png/scripts/makefile.ne12bsd
index 48066969cda7fa41513b6b3f73bf2febe794c844..bf6ac2d6217e2d99d2e77535ad4d2314882fb133 100644 (file)
--- a/src/png/scripts/makefile.ne12bsd
+++ b/src/png/scripts/makefile.ne12bsd
@@ -2,32 +2,34 @@
 # make obj && make depend && make && make test
 # make includes && make install
 # Copyright (C) 2002 Patrick R.L. Welche
-# For conditions of distribution and use, see copyright notice in png.h
+# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
+#
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
 
 # You should also run makefile.netbsd
 
 LOCALBASE?=/usr/local
 LIBDIR=        ${LOCALBASE}/lib
 MANDIR= ${LOCALBASE}/man
-INCSDIR=${LOCALBASE}/include/libpng12
+INCSDIR=${LOCALBASE}/include/libpng14
 
-LIB=   png12
+LIB=   png14
 SHLIB_MAJOR=   0
-SHLIB_MINOR=   1.2.6
-SRCS=  pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
-               pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
-               pngwtran.c pngmem.c pngerror.c pngpread.c
+SHLIB_MINOR=   1.4.4
+SRCS=  png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
+       pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
+       pngwtran.c pngmem.c pngerror.c pngpread.c
 INCS=  png.h pngconf.h
 MAN=   libpng.3 libpngpf.3 png.5
 
-CPPFLAGS+=-I${.CURDIR} -DPNG_USE_PNGGCCRD
+CPPFLAGS+=-I${.CURDIR}
 
-# something like this for mmx assembler, but it core dumps for me at the moment
+# We should be able to do something like this instead of the manual
+# uncommenting, but it core dumps for me at the moment:
 # .if ${MACHINE_ARCH} == "i386"
-#   CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK
 #   MKLINT= no
-# .else
-    CPPFLAGS+=-DPNG_NO_ASSEMBLER_CODE
 # .endif
 
 CLEANFILES+=pngtest.o pngtest