diff options
| author | Cosmin Truta <ctruta@gmail.com> | 2014-03-22 11:19:35 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-03-22 11:19:35 -0500 |
| commit | 4904cbce65b977a8106cf10984f6bbb6b69c71bc (patch) | |
| tree | 6fd98b77c3070d7678c040f2fd50522320345e01 /scripts/makefile.msc | |
| parent | d2016be48dde90354c58c6ead88f7b8a53cc560e (diff) | |
| download | libpng-4904cbce65b977a8106cf10984f6bbb6b69c71bc.tar.gz | |
[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.
Diffstat (limited to 'scripts/makefile.msc')
| -rw-r--r-- | scripts/makefile.msc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/makefile.msc b/scripts/makefile.msc index 905ed72c5..f2f1d280f 100644 --- a/scripts/makefile.msc +++ b/scripts/makefile.msc @@ -16,6 +16,7 @@ CFLAGS=-Oait -Gs -nologo -W3 -A$(MODEL) CC=cl LD=link LDFLAGS=/e/st:0x1500/noe +CP=copy O=.obj #uncomment next to put error messages in a file @@ -30,10 +31,10 @@ all: libpng.lib # see scripts/pnglibconf.mak for more options pnglibconf.h: scripts/pnglibconf.h.prebuilt - cp 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) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE) pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE) |