aboutsummaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2012-03-12 22:18:36 -0700
committerMark Adler <madler@alumni.caltech.edu>2012-03-12 22:18:36 -0700
commit142f051fb27ef7f40e0341a68b23dfd17a4b1fe9 (patch)
tree7acfb453e0fd75405eaddb47e4041d727bcddb0a /win32
parent39c7ed14ac67413ac481aa136d2606d94e24536e (diff)
downloadzlib-142f051fb27ef7f40e0341a68b23dfd17a4b1fe9.tar.gz
zlib-142f051fb27ef7f40e0341a68b23dfd17a4b1fe9.tar.bz2
zlib-142f051fb27ef7f40e0341a68b23dfd17a4b1fe9.zip
Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta].
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.gcc7
1 files changed, 3 insertions, 4 deletions
diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc
index 203d769..d3d573c 100644
--- a/win32/Makefile.gcc
+++ b/win32/Makefile.gcc
@@ -40,7 +40,6 @@ SHARED_MODE=0
40PREFIX = 40PREFIX =
41CC = $(PREFIX)gcc 41CC = $(PREFIX)gcc
42CFLAGS = $(LOC) -O3 -Wall 42CFLAGS = $(LOC) -O3 -Wall
43EXTRA_CFLAGS = -DNO_VIZ
44 43
45AS = $(CC) 44AS = $(CC)
46ASFLAGS = $(LOC) -Wall 45ASFLAGS = $(LOC) -Wall
@@ -79,7 +78,7 @@ testdll: example_d.exe minigzip_d.exe
79 echo hello world | ./minigzip_d | ./minigzip_d -d 78 echo hello world | ./minigzip_d | ./minigzip_d -d
80 79
81.c.o: 80.c.o:
82 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< 81 $(CC) $(CFLAGS) -c -o $@ $<
83 82
84.S.o: 83.S.o:
85 $(AS) $(ASFLAGS) -c -o $@ $< 84 $(AS) $(ASFLAGS) -c -o $@ $<
@@ -111,10 +110,10 @@ minigzip_d.exe: minigzip.o $(IMPLIB)
111 $(STRIP) $@ 110 $(STRIP) $@
112 111
113example.o: test/example.c zlib.h zconf.h 112example.o: test/example.c zlib.h zconf.h
114 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -c -o $@ test/example.c 113 $(CC) $(CFLAGS) -I. -c -o $@ test/example.c
115 114
116minigzip.o: test/minigzip.c zlib.h zconf.h 115minigzip.o: test/minigzip.c zlib.h zconf.h
117 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -c -o $@ test/minigzip.c 116 $(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
118 117
119zlibrc.o: win32/zlib1.rc 118zlibrc.o: win32/zlib1.rc
120 $(RC) $(RCFLAGS) -o $@ win32/zlib1.rc 119 $(RC) $(RCFLAGS) -o $@ win32/zlib1.rc