diff options
| author | Haibo Huang <hhb@google.com> | 2019-06-10 11:41:54 -0700 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2019-06-10 14:38:44 -0700 |
| commit | 4f55151a4b8cbda0ea61646f437fdf57c54190d9 (patch) | |
| tree | 478f3db238be7e08885ac80ac8ef1be9935441bb /scripts/makefile.gcc | |
| parent | 9ef33ccf9b2e957c1f5e228dbab15fbda1744300 (diff) | |
| parent | a40189cf881e9f0db80511c382292a5604c3c3d1 (diff) | |
Merge tag 'v1.6.37' into HEAD
Test: build
Bug: 134761359
Change-Id: Iee93c2907d93430a8de681f2e987d37f4b3b17bc
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 |