Changeset 846 for trunk/src/3rdparty/libpng/scripts/makefile.mingw

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/libpng/scripts/makefile.mingw (modified) (6 diffs)

trunk/src/3rdparty/libpng/scripts/makefile.mingw

@@ -8 +8 @@
 # Copyright (C) 1998-2000, 2007 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
-
+#
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
@@ -62 +62 @@
         -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
-MINGDLL = 12
-PNGMIN = 1.2.40
+LIBNAME = libpng14
+PNGMAJ = 14
+MINGDLL = 14
+PNGMIN = 1.4.0
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
@@ -139 +130 @@
         -e s!@includedir@!$(INCPATH)! \
         -e s!@includedir@!$(INCPATH)! \
-        -e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
+        -e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc
 
 libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in
@@ -161 +152 @@
         $(RANLIB) $@
 
-$(SHAREDDEF): scripts/pngw32.def
+$(SHAREDDEF): scripts/pngwin.def
         cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
         sed -e 's/\([^;]*\);/;/' > $@
@@ -246 +237 @@
         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
 
@@ -271 +262 @@
 # 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 pngtest.pic.o:        png.h pngconf.h pngtest.c