[libpng15] Port recent changes from libpng-1.6.11beta

Silence 'unused parameter' build warnings (Cosmin).
  $(CP) is now used alongside $(RM_F).  Also, use 'copy' instead
    of 'cp' where applicable, and applied other minor makefile changes.
  Don't warn about invalid dimensions exceeding user limits.
This commit is contained in:
Cosmin Truta
2014-03-22 11:19:35 -05:00
committed by Glenn Randers-Pehrson
parent d2016be48d
commit 4904cbce65
40 changed files with 142 additions and 79 deletions

View File

@@ -9,9 +9,9 @@
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
# To use, do "nmake /f scripts\makefile.vcwin32"
# -------- Microsoft Visual C++ 2.0 and later, no assembler code --------
# -------- Microsoft Visual C++ 2.0 and later --------
# Compiler, linker, librarian, and other tools
# Compiler, linker, librarian and other tools
CC = cl
LD = link
AR = lib
@@ -19,6 +19,7 @@ CPPFLAGS = -I..\zlib
CFLAGS = -nologo -D_CRT_SECURE_NO_DEPRECATE -MD -O2 -W3
LDFLAGS = -nologo
ARFLAGS = -nologo
CP = copy
RM = del
# File extensions
@@ -38,7 +39,7 @@ all: libpng.lib
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts\pnglibconf.h.prebuilt
copy scripts\pnglibconf.h.prebuilt $@
$(CP) $< $@
png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)