diff options
| author | Haibo Huang <hhb@google.com> | 2019-06-10 15:47:49 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-10 15:47:49 -0700 |
| commit | df3dc85d2ff9d18f15ff7a217a1ed52a3eb7b6bf (patch) | |
| tree | 478f3db238be7e08885ac80ac8ef1be9935441bb /scripts/makefile.gcc | |
| parent | 4813fb533a80d139fb8139369cd6c25947d1017d (diff) | |
| parent | 54ca51b2ee6da088d5eb1c7ef6430b1c83019977 (diff) | |
Merge "Merge tag 'v1.6.37' into HEAD" am: 7794b22253 am: aa0ce810a6 am: 490afb6c02
am: 54ca51b2ee
Change-Id: Ie28ab673ec855738e26ca3ba06a061856ca07045
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 |