Merge in from trunk r64802 - r68625

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

diff --git a/src/png/scripts/makefile.cygwin b/src/png/scripts/makefile.cygwin
index f780d04cad4421df0498956e349273c83828f9da..23cabb188968303da19ee04ba7ca76c339628f1c 100644 (file)
--- a/src/png/scripts/makefile.cygwin
+++ b/src/png/scripts/makefile.cygwin
@@ -7,7 +7,10 @@
 #    and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by:
 # Copyright (C) 1998-2000 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+#
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
 
 # This makefile intends to support building outside the src directory
 # if desired. When invoking it, specify an argument to SRCDIR on the
@@ -58,24 +61,13 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
        -Wmissing-declarations -Wtraditional -Wcast-align \
        -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 
-### if you don't need thread safety, but want the asm accel
-#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK \
-#      $(addprefix -I,$(ZLIBINC)) -W -Wall -O $(ALIGN) -funroll-loops \
-#      -fomit-frame-pointer)  # $(WARNMORE) -g -DPNG_DEBUG=5
-### if you need thread safety and want (minimal) asm accel
-#CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
-#      -W -Wall -O $(ALIGN) -funroll-loops \
-#      -fomit-frame-pointer)  # $(WARNMORE) -g -DPNG_DEBUG=5
-### Normal (non-asm) compilation
 CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
-        -W -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \
+        -W -Wall -O3 $(ALIGN) -funroll-loops \
        -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
 
-LIBNAME = libpng12
-PNGMAJ = 0
-CYGDLL = 12
-PNGMIN = 1.2.34
-PNGVER = $(PNGMAJ).$(PNGMIN)
+LIBNAME = libpng14
+PNGMAJ = 14
+CYGDLL = 14
 
 SHAREDLIB=cygpng$(CYGDLL).dll
 STATLIB=libpng.a
@@ -138,7 +130,7 @@ libpng.pc: scripts/libpng.pc.in
        -e s!@exec_prefix@!$(exec_prefix)! \
        -e s!@libdir@!$(LIBPATH)! \
        -e s!@includedir@!$(INCPATH)! \
-       -e s!-lpng12!-lpng12\ -lz! > libpng.pc
+       -e s!-lpng14!-lpng14\ -lz! > libpng.pc
 
 libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in
        @echo -e Making $(LIBNAME) libpng-config file for this libpng \
@@ -160,7 +152,7 @@ $(STATLIB): $(OBJS)
        ar rc $@ $(OBJS)
        $(RANLIB) $@
 
-$(SHAREDDEF): scripts/pngw32.def
+$(SHAREDDEF): scripts/pngwin.def
        cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
        sed -e 's/\([^;]*\);/;/' > $@
 
@@ -176,7 +168,7 @@ pngtest-stat$(EXE): pngtest.o $(STATLIB)
 pngtest.pic.o: pngtest.c
        $(CC) $(CFLAGS) -c $< -o $@
 
-pngtest.o: pngtest.c
+pngtest.o: pngtest.c png.h pngconf.h
        $(CC) $(CFLAGS) -c $< -o $@
 
 test: test-static test-shared
@@ -251,16 +243,16 @@ test-dd:
        echo
        echo Testing installed dynamic shared library in $(DL).
        $(CC) -I$(DI) $(CFLAGS) \
-          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          `$(BINPATH)/libpng14-config --cflags` pngtest.c \
           -L$(DL) -L$(ZLIBLIB) \
-          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+          -o pngtestd `$(BINPATH)/libpng14-config --ldflags`
        ./pngtestd pngtest.png
 
 test-installed:
        $(CC) $(CFLAGS) \
-          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          `$(BINPATH)/libpng14-config --cflags` pngtest.c \
           -L$(ZLIBLIB) \
-          -o pngtesti$(EXE) `$(BINPATH)/libpng12-config --ldflags`
+          -o pngtesti$(EXE) `$(BINPATH)/libpng14-config --ldflags`
        ./pngtesti$(EXE) pngtest.png
 
 clean:
@@ -276,21 +268,21 @@ writelock:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-png.o png.pic.o:               png.h pngconf.h png.c
-pngerror.o pngerror.pic.o:     png.h pngconf.h pngerror.c
-pngrio.o pngrio.pic.o:         png.h pngconf.h pngrio.c
-pngwio.o pngwio.pic.o:         png.h pngconf.h pngwio.c
-pngmem.o pngmem.pic.o:         png.h pngconf.h pngmem.c
-pngset.o pngset.pic.o:         png.h pngconf.h pngset.c
-pngget.o pngget.pic.o:         png.h pngconf.h pngget.c
-pngread.o pngread.pic.o:       png.h pngconf.h pngread.c
-pngrtran.o pngrtran.pic.o:     png.h pngconf.h pngrtran.c
-pngrutil.o pngrutil.pic.o:     png.h pngconf.h pngrutil.c
-pngtrans.o pngtrans.pic.o:     png.h pngconf.h pngtrans.c
-pngwrite.o pngwrite.pic.o:     png.h pngconf.h pngwrite.c
-pngwtran.o pngwtran.pic.o:     png.h pngconf.h pngwtran.c
-pngwutil.o pngwutil.pic.o:     png.h pngconf.h pngwutil.c
-pngpread.o pngpread.pic.o:     png.h pngconf.h pngpread.c
+png.o png.pic.o:               png.h pngconf.h pngpriv.h png.c
+pngerror.o pngerror.pic.o:     png.h pngconf.h pngpriv.h pngerror.c
+pngrio.o pngrio.pic.o:         png.h pngconf.h pngpriv.h pngrio.c
+pngwio.o pngwio.pic.o:         png.h pngconf.h pngpriv.h pngwio.c
+pngmem.o pngmem.pic.o:         png.h pngconf.h pngpriv.h pngmem.c
+pngset.o pngset.pic.o:         png.h pngconf.h pngpriv.h pngset.c
+pngget.o pngget.pic.o:         png.h pngconf.h pngpriv.h pngget.c
+pngread.o pngread.pic.o:       png.h pngconf.h pngpriv.h pngread.c
+pngrtran.o pngrtran.pic.o:     png.h pngconf.h pngpriv.h pngrtran.c
+pngrutil.o pngrutil.pic.o:     png.h pngconf.h pngpriv.h pngrutil.c
+pngtrans.o pngtrans.pic.o:     png.h pngconf.h pngpriv.h pngtrans.c
+pngwrite.o pngwrite.pic.o:     png.h pngconf.h pngpriv.h pngwrite.c
+pngwtran.o pngwtran.pic.o:     png.h pngconf.h pngpriv.h pngwtran.c
+pngwutil.o pngwutil.pic.o:     png.h pngconf.h pngpriv.h pngwutil.c
+pngpread.o pngpread.pic.o:     png.h pngconf.h pngpriv.h pngpread.c
 
 pngtest.o:                     png.h pngconf.h pngtest.c
 pngtest-stat.o:                        png.h pngconf.h pngtest.c