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.gcc | |
| parent | d22b72011118e2e00c01519ba79801804773ac07 (diff) | |
| parent | 7794b2225328b6423a98c2c8de2afa21e4783036 (diff) | |
Merge "Merge tag 'v1.6.37' into HEAD"
am: 7794b22253
Change-Id: Icd76c301afccd9c4afb39b0d27e84bf39512c81a
Diffstat (limited to 'scripts/makefile.gcc')
| -rw-r--r-- | scripts/makefile.gcc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index ba92d1509..a97731367 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc @@ -1,6 +1,6 @@ # makefile for libpng using gcc (generic, static library) # Copyright (C) 2008, 2014 Glenn Randers-Pehrson -# Copyright (C) 2000 Cosmin Truta +# Copyright (C) 2000, 2014, 2019 Cosmin Truta # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the libpng license. @@ -24,7 +24,7 @@ WARNMORE = -Wwrite-strings -Wpointer-arith -Wshadow \ -Wstrict-prototypes -Wmissing-prototypes # -Wconversion CPPFLAGS = -I$(ZLIBINC) # -DPNG_DEBUG=5 CFLAGS = -W -Wall -O2 # $(WARNMORE) -g -LDFLAGS = +LDFLAGS = -L$(ZLIBLIB) LIBS = -lz -lm # File extensions @@ -63,7 +63,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 |