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 | Project-Tick-67cc20d0041a32bee12bd9eb20ae218f91b73f77.tar.gz Project-Tick-67cc20d0041a32bee12bd9eb20ae218f91b73f77.zip | |
zlib 1.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 97571c2f6d..abe3d5a365 100644 --- a/win32/Makefile.gcc +++ b/win32/Makefile.gcc @@ -25,7 +25,7 @@ STATICLIB = libz.a SHAREDLIB = zlib1.dll -IMPLIB = libz.dll.a +IMPLIB = libzdll.a #LOC = -DASMV #LOC = -DDEBUG -g diff --git a/win32/Makefile.msc b/win32/Makefile.msc index 3722b233ad..a731c0c621 100644 --- a/win32/Makefile.msc +++ b/win32/Makefile.msc @@ -21,10 +21,10 @@ AS = ml LD = link AR = lib RC = rc -CFLAGS = -nologo -MD -O2 -Oy- $(LOC) +CFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) WFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -ASFLAGS = -coff -LDFLAGS = -nologo -debug -release +ASFLAGS = -coff -Zi +LDFLAGS = -nologo -debug -incremental:no -opt:ref ARFLAGS = -nologo RCFLAGS = /dWIN32 /r @@ -44,7 +44,7 @@ $(IMPLIB): $(SHAREDLIB) $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res $(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \ - -out:$@ $(OBJS) $(OBJA) zlib1.res + -out:$@ -base:0x5A4C0000 $(OBJS) $(OBJA) zlib1.res if exist $@.manifest \ mt -nologo -manifest $@.manifest -outputresource:$@;2 |