diff options
| author | Haibo Huang <hhb@google.com> | 2019-06-10 15:25:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-10 15:25:51 -0700 |
| commit | aa0ce810a62b165c39abf6252c5fec107716a2fe (patch) | |
| tree | 478f3db238be7e08885ac80ac8ef1be9935441bb /scripts/makefile.msys | |
| parent | d22b72011118e2e00c01519ba79801804773ac07 (diff) | |
| parent | 7794b2225328b6423a98c2c8de2afa21e4783036 (diff) | |
Merge "Merge tag 'v1.6.37' into HEAD"
am: 7794b22253
Change-Id: Icd76c301afccd9c4afb39b0d27e84bf39512c81a
Diffstat (limited to 'scripts/makefile.msys')
| -rw-r--r-- | scripts/makefile.msys | 9 |
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) \ |