no need to check for wxID_HELP buttons in SetLabel() now that it's overridden in...

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

diff --git a/src/png/scripts/makefile.netbsd b/src/png/scripts/makefile.netbsd
index a7015267279d862a333a83d02e9cfb90b15fe055..bfe03439444dd4018d689c5eda1b779515011b04 100644 (file)
--- a/src/png/scripts/makefile.netbsd
+++ b/src/png/scripts/makefile.netbsd
@@ -2,6 +2,7 @@
 # make obj && make depend && make && make test
 # make includes && make install
 # Copyright (C) 2002 Patrick R.L. Welche
 # make obj && make depend && make && make test
 # make includes && make install
 # Copyright (C) 2002 Patrick R.L. Welche

+# Copyright (C) 2007 Glenn Randers-Pehrson

 # For conditions of distribution and use, see copyright notice in png.h
 
 # You should also run makefile.ne0bsd
 # For conditions of distribution and use, see copyright notice in png.h
 
 # You should also run makefile.ne0bsd


@@ -13,21 +14,21 @@ INCSDIR=${LOCALBASE}/include/libpng
 
 LIB=   png
 SHLIB_MAJOR=   3
 
 LIB=   png
 SHLIB_MAJOR=   3

-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.2.34
+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
 
 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
 # .if ${MACHINE_ARCH} == "i386"
 #   CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK
 #   MKLINT= no
 # .else
 
 # something like this for mmx assembler, 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
+    CPPFLAGS+=-DPNG_NO_MMX_CODE

 # .endif
 
 CLEANFILES+=pngtest.o pngtest
 # .endif
 
 CLEANFILES+=pngtest.o pngtest