summaryrefslogtreecommitdiff
path: root/scripts/makefile.msys
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2019-06-10 11:41:54 -0700
committerHaibo Huang <hhb@google.com>2019-06-10 14:38:44 -0700
commit4f55151a4b8cbda0ea61646f437fdf57c54190d9 (patch)
tree478f3db238be7e08885ac80ac8ef1be9935441bb /scripts/makefile.msys
parent9ef33ccf9b2e957c1f5e228dbab15fbda1744300 (diff)
parenta40189cf881e9f0db80511c382292a5604c3c3d1 (diff)
Merge tag 'v1.6.37' into HEAD
Test: build Bug: 134761359 Change-Id: Iee93c2907d93430a8de681f2e987d37f4b3b17bc
Diffstat (limited to 'scripts/makefile.msys')
-rw-r--r--scripts/makefile.msys9
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/makefile.msys b/scripts/makefile.msys
index 33b7721d4..6b9daf836 100644
--- a/scripts/makefile.msys
+++ b/scripts/makefile.msys
@@ -1,10 +1,11 @@
# makefile for libpng using MSYS/gcc (shared, static library)
+# Copyright (C) 2019 Cosmin Truta
# Copyright (C) 2012 Glenn Randers-Pehrson and Christopher M. Wheeler
#
-# Portions taken from makefile.linux:
+# Portions taken from makefile.linux and makefile.gcc:
+# Copyright (C) 2000 Cosmin Truta
# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2014 Greg Roelofs and
# Glenn Randers-Pehrson
-# Copyright (C) 2000 Cosmin Truta
# Copyright (C) 1996, 1997 Andreas Dilger
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -18,7 +19,7 @@ exec_prefix=$(prefix)
# Library name:
LIBNAME = libpng16
PNGMAJ = 16
-RELEASE = 34
+RELEASE = 37
# Shared library names:
LIBSO=$(LIBNAME).dll
@@ -176,7 +177,7 @@ test: pngtest$(EXEEXT)
./pngtest$(EXEEXT)
pngtest$(EXEEXT): pngtest.o libpng.a
- $(LD) $(LDFLAGS) -L$(ZLIBLIB) -o $@ pngtest.o libpng.a $(LIBS)
+ $(LD) $(LDFLAGS) -o $@ pngtest.o libpng.a $(LIBS)
clean:
$(RM_F) *.o libpng.a pngtest$(EXEEXT) pngout.png pnglibconf.h $(LIBSO) \