diff options
| author | aavit <qt-info@nokia.com> | 2009-10-15 12:48:31 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2009-10-22 09:56:09 (GMT) |
| commit | ed1892665111f900e4d831a41b4ec79666931f0d (patch) | |
| tree | ca66edcdd61cbe36aa80f450953bf02a8e267df7 /src/3rdparty/libpng/scripts/makefile.vcawin32 | |
| parent | d4a136dc3f1176665c19eec24fa43f40e5180a89 (diff) | |
| download | Qt-ed1892665111f900e4d831a41b4ec79666931f0d.zip Qt-ed1892665111f900e4d831a41b4ec79666931f0d.tar.gz Qt-ed1892665111f900e4d831a41b4ec79666931f0d.tar.bz2 | |
Upgrade libpng to version 1.2.40
This commit contains a clean copy of the libpng source distribution.
The Qt patches will follow in a separate commit.
Diffstat (limited to 'src/3rdparty/libpng/scripts/makefile.vcawin32')
| -rw-r--r-- | src/3rdparty/libpng/scripts/makefile.vcawin32 | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/3rdparty/libpng/scripts/makefile.vcawin32 b/src/3rdparty/libpng/scripts/makefile.vcawin32 index 99f5430..0b89d84 100644 --- a/src/3rdparty/libpng/scripts/makefile.vcawin32 +++ b/src/3rdparty/libpng/scripts/makefile.vcawin32 @@ -1,17 +1,22 @@ # makefile for libpng +# Copyright (C) 2006,2009 Glenn Randers-Pehrson # Copyright (C) 1998 Tim Wegner -# 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 + # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # To use, do "nmake /f scripts\makefile.vcawin32" -# -------- Microsoft Visual C++ 5.0 and later, uses assembler code -------- +# -------- Microsoft Visual C++ 2.0 and later, no assembler code -------- # If you don't want to use assembler (MMX) code, use makefile.vcwin32 instead. # Compiler, linker, librarian, and other tools CC = cl LD = link AR = lib -CFLAGS = -DPNG_USE_PNGVCRD -nologo -MD -O2 -W3 -I..\zlib +CFLAGS = -nologo -DPNG_USE_PNGVCRD -MD -O2 -W3 -I..\zlib LDFLAGS = -nologo ARFLAGS = -nologo RM = del @@ -64,9 +69,6 @@ pngrio$(O): png.h pngconf.h pngwio$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) -pngtest$(O): png.h pngconf.h - $(CC) -c $(CFLAGS) $*.c $(ERRFILE) - pngtrans$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) @@ -83,6 +85,9 @@ libpng.lib: $(OBJS) -$(RM) $@ $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE) +pngtest$(O): png.h pngconf.h + $(CC) -c $(CFLAGS) $*.c $(ERRFILE) + pngtest.exe: pngtest$(O) libpng.lib $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE) |