summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-09-09 23:32:36 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-09-09 23:32:36 -0700
commit67cc20d0041a32bee12bd9eb20ae218f91b73f77 (patch)
treed7e1b94bd15c30efd57cf9036f5fe89306b6bba0 /win32
parent7751bd4c715ea8478113e34b49b5a794a4642e8e (diff)
downloadzlib-1.2.4-pre1.tar.gz
zlib-1.2.4-pre1.tar.bz2
zlib-1.2.4-pre1.zip
zlib 1.2.4-pre1v1.2.4-pre1
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.gcc2
-rw-r--r--win32/Makefile.msc8
2 files changed, 5 insertions, 5 deletions
diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc
index 97571c2..abe3d5a 100644
--- a/win32/Makefile.gcc
+++ b/win32/Makefile.gcc
@@ -25,7 +25,7 @@
25 25
26STATICLIB = libz.a 26STATICLIB = libz.a
27SHAREDLIB = zlib1.dll 27SHAREDLIB = zlib1.dll
28IMPLIB = libz.dll.a 28IMPLIB = libzdll.a
29 29
30#LOC = -DASMV 30#LOC = -DASMV
31#LOC = -DDEBUG -g 31#LOC = -DDEBUG -g
diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index 3722b23..a731c0c 100644
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -21,10 +21,10 @@ AS = ml
21LD = link 21LD = link
22AR = lib 22AR = lib
23RC = rc 23RC = rc
24CFLAGS = -nologo -MD -O2 -Oy- $(LOC) 24CFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
25WFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE 25WFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
26ASFLAGS = -coff 26ASFLAGS = -coff -Zi
27LDFLAGS = -nologo -debug -release 27LDFLAGS = -nologo -debug -incremental:no -opt:ref
28ARFLAGS = -nologo 28ARFLAGS = -nologo
29RCFLAGS = /dWIN32 /r 29RCFLAGS = /dWIN32 /r
30 30
@@ -44,7 +44,7 @@ $(IMPLIB): $(SHAREDLIB)
44 44
45$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res 45$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res
46 $(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \ 46 $(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \
47 -out:$@ $(OBJS) $(OBJA) zlib1.res 47 -out:$@ -base:0x5A4C0000 $(OBJS) $(OBJA) zlib1.res
48 if exist $@.manifest \ 48 if exist $@.manifest \
49 mt -nologo -manifest $@.manifest -outputresource:$@;2 49 mt -nologo -manifest $@.manifest -outputresource:$@;2
50 50