Merge in from trunk r64802 - r68625

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

diff --git a/src/png/scripts/makefile.intel b/src/png/scripts/makefile.intel
index b0b523af082d9f561fc5e8a6054563e8480d4606..fb705e121dedbccaf5269337cfe03752f2b689bb 100644 (file)
--- a/src/png/scripts/makefile.intel
+++ b/src/png/scripts/makefile.intel
@@ -1,12 +1,17 @@
 # Makefile for libpng
 # Microsoft Visual C++ with Intel C/C++ Compiler 4.0 and later
 
 # Makefile for libpng
 # 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.
 # 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"
 # 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
 ZLIBLIB=..\zlib
 
 # Where the zlib library and include files are located
 ZLIBLIB=..\zlib


@@ -26,7 +31,6 @@ CALLING=r     # __fastcall
 
 # --------------------------------------------------------------------------
 
 
 # --------------------------------------------------------------------------
 

-

 CC=icl -c
 CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo
 LD=link
 CC=icl -c
 CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo
 LD=link


@@ -40,52 +44,49 @@ pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
 
 all: test
 
 
 all: test
 

-png$(O): png.h pngconf.h
+png$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngset$(O): png.h pngconf.h
+pngset$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngget$(O): png.h pngconf.h
+pngget$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngread$(O): png.h pngconf.h
+pngread$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngpread$(O): png.h pngconf.h
+pngpread$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngrtran$(O): png.h pngconf.h
+pngrtran$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngrutil$(O): png.h pngconf.h
+pngrutil$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngerror$(O): png.h pngconf.h
+pngerror$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngmem$(O): png.h pngconf.h
+pngmem$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngrio$(O): png.h pngconf.h
+pngrio$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngwio$(O): png.h pngconf.h
+pngwio$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngtest$(O): png.h pngconf.h
+pngtrans$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngtrans$(O): png.h pngconf.h
+pngwrite$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngwrite$(O): png.h pngconf.h
+pngwtran$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 

-pngwtran$(O): png.h pngconf.h
-       $(CC) $(CFLAGS) $*.c $(ERRFILE)
-
-pngwutil$(O): png.h pngconf.h
+pngwutil$(O): png.h pngconf.h pngpriv.h

        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
 libpng.lib: $(OBJS)
        $(CC) $(CFLAGS) $*.c $(ERRFILE)
 
 libpng.lib: $(OBJS)


@@ -95,6 +96,9 @@ libpng.lib: $(OBJS)
 pngtest.exe: pngtest.obj libpng.lib
        $(LD) $(LDFLAGS) /OUT:pngtest.exe pngtest.obj libpng.lib $(ZLIBLIB)\zlib.lib
 
 pngtest.exe: pngtest.obj libpng.lib
        $(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
 
 test: pngtest.exe
        pngtest.exe