Don't auto-link with 3rd party libraries in DLL build using MSVC.

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

diff --git a/src/png/scripts/makefile.ne12bsd b/src/png/scripts/makefile.ne12bsd
index 32d53720c5107b98cf52e8af391b5f8c9ceeb063..dde794a1a25c4e7412b28ac90429665fb741ad4e 100644 (file)
--- a/src/png/scripts/makefile.ne12bsd
+++ b/src/png/scripts/makefile.ne12bsd
@@ -2,35 +2,41 @@
 # 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

-# 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
 
 # You should also run makefile.netbsd
 
 LOCALBASE?=/usr/local
 LIBDIR=        ${LOCALBASE}/lib
 MANDIR= ${LOCALBASE}/man

-INCSDIR=${LOCALBASE}/include/libpng12
+INCSDIR=${LOCALBASE}/include/libpng15

 
 

-LIB=   png12
+LIB=   png15

 SHLIB_MAJOR=   0
 SHLIB_MAJOR=   0

-SHLIB_MINOR=   1.2.7
-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
-INCS=  png.h pngconf.h
+SHLIB_MINOR=   1.5.6
+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 pnglibconf.h

 MAN=   libpng.3 libpngpf.3 png.5
 
 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"
 # .if ${MACHINE_ARCH} == "i386"

-#   CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK

 #   MKLINT= no
 #   MKLINT= no

-# .else
-    CPPFLAGS+=-DPNG_NO_ASSEMBLER_CODE

 # .endif
 
 # .endif
 

-CLEANFILES+=pngtest.o pngtest
+CLEANFILES+=pngtest.o pngtest pnglibconf.h
+
+# see scripts/pnglibconf.mak for more options
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+       cp scripts/pnglibconf.h.prebuilt $@

 
 pngtest.o:     pngtest.c
        ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
 
 pngtest.o:     pngtest.c
        ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}