Changeset 561 for trunk/src/3rdparty/libpng/scripts/makefile.nommx

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

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

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

@@ -1 +1 @@
 # makefile for libpng.a and libpng12.so on Linux ELF with gcc
-# Copyright (C) 1998, 1999, 2002, 2006, 2007 Greg Roelofs and
+# Copyright (C) 1998, 1999, 2002, 2006-2008 Greg Roelofs and
 # Glenn Randers-Pehrson
 # 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
 
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.29
+PNGMIN = 1.2.40
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
@@ -49 +52 @@
 # for pgcc version 2.95.1, -O3 is buggy; don't use it.
 
-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
+CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
         $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
 
@@ -234 +237 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-png.o png.pic.o: png.h pngconf.h
-pngerror.o pngerror.pic.o: png.h pngconf.h
-pngrio.o pngrio.pic.o: png.h pngconf.h
-pngwio.o pngwio.pic.o: png.h pngconf.h
-pngmem.o pngmem.pic.o: png.h pngconf.h
-pngset.o pngset.pic.o: png.h pngconf.h
-pngget.o pngget.pic.o: png.h pngconf.h
-pngread.o pngread.pic.o: png.h pngconf.h
-pngrtran.o pngrtran.pic.o: png.h pngconf.h
-pngrutil.o pngrutil.pic.o: png.h pngconf.h
-pngtrans.o pngtrans.pic.o: png.h pngconf.h
-pngwrite.o pngwrite.pic.o: png.h pngconf.h
-pngwtran.o pngwtran.pic.o: png.h pngconf.h
-pngwutil.o pngwutil.pic.o: png.h pngconf.h
-pngpread.o pngpread.pic.o: png.h pngconf.h
-
-pngtest.o: png.h pngconf.h
+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
+
+pngtest.o:                      png.h pngconf.h pngtest.c