diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:32:36 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:32:36 -0700 |
commit | 67cc20d0041a32bee12bd9eb20ae218f91b73f77 (patch) | |
tree | d7e1b94bd15c30efd57cf9036f5fe89306b6bba0 /win32 | |
parent | 7751bd4c715ea8478113e34b49b5a794a4642e8e (diff) | |
download | zlib-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.gcc | 2 | ||||
-rw-r--r-- | win32/Makefile.msc | 8 |
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 | ||
26 | STATICLIB = libz.a | 26 | STATICLIB = libz.a |
27 | SHAREDLIB = zlib1.dll | 27 | SHAREDLIB = zlib1.dll |
28 | IMPLIB = libz.dll.a | 28 | IMPLIB = 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 | |||
21 | LD = link | 21 | LD = link |
22 | AR = lib | 22 | AR = lib |
23 | RC = rc | 23 | RC = rc |
24 | CFLAGS = -nologo -MD -O2 -Oy- $(LOC) | 24 | CFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) |
25 | WFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE | 25 | WFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE |
26 | ASFLAGS = -coff | 26 | ASFLAGS = -coff -Zi |
27 | LDFLAGS = -nologo -debug -release | 27 | LDFLAGS = -nologo -debug -incremental:no -opt:ref |
28 | ARFLAGS = -nologo | 28 | ARFLAGS = -nologo |
29 | RCFLAGS = /dWIN32 /r | 29 | RCFLAGS = /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 | ||