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

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.intel (modified) (4 diffs)

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

@@ -2 +2 @@
 # Microsoft Visual C++ with Intel C/C++ Compiler 4.0 and later
 
+# Copyright (C) 2006 Glenn Randers-Pehrson
 # Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is
 # copyright 1995 Guy Eric Schalnat, Group 42, Inc.
-# 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
 
 # To use, do "nmake /f scripts\makefile.intel"
 
+# ------------------- Intel C/C++ Compiler 4.0 and later -------------------
 
 # Where the zlib library and include files are located
@@ -26 +31 @@
 
 # --------------------------------------------------------------------------
-
 
 CC=icl -c
@@ -74 +78 @@
         $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
-pngtest$(O): png.h pngconf.h
-        $(CC) $(CFLAGS) $*.c $(ERRFILE)
-
 pngtrans$(O): png.h pngconf.h
         $(CC) $(CFLAGS) $*.c $(ERRFILE)
@@ -96 +97 @@
         $(LD) $(LDFLAGS) /OUT:pngtest.exe pngtest.obj libpng.lib $(ZLIBLIB)\zlib.lib
 
+pngtest$(O): png.h pngconf.h
+        $(CC) $(CFLAGS) $*.c $(ERRFILE)
+
 test: pngtest.exe
         pngtest.exe