Fix MSVC build and clean up unneccessary BSDLIBS leftovers

diff --git a/Makefile.in b/Makefile.in
index d1f4b245edbdfda46e12495e443c451586ae3e72..81c6294b4f33566932aa346d281dd35f4e18fea3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,7 +49,6 @@ SHELL=/bin/sh
 EXE=
 
 SRCDIR=.
-BSDLIBS=
 INCLUDES=-I$(SRCDIR)
 
 ARCHDIR=arch/generic
@@ -137,7 +136,7 @@ infcover.o: $(SRCDIR)/test/infcover.c $(SRCDIR)/zlib.h zconf.h
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/test/infcover.c
 
 infcover$(EXE): infcover.o $(STATICLIB)
-       $(CC) $(CFLAGS) -o $@ infcover.o $(STATICLIB) $(BSDLIBS)
+       $(CC) $(CFLAGS) -o $@ infcover.o $(STATICLIB)
 ifneq ($(STRIP),)
        $(STRIP) $@
 endif

diff --git a/configure b/configure
index 2712265c92e3e1c33afcc44a8d7e0a9eaf44fdcb..5b48d9144617cfbc64f09dd8b2ca41e67f45a15e 100755 (executable)
--- a/configure
+++ b/configure
@@ -759,7 +759,6 @@ echo RC = $RC >> configure.log
 echo RCFLAGS = $RCFLAGS >> configure.log
 echo RCOBJS = $RCOBJS >> configure.log
 echo STRIP = $STRIP >> configure.log
-echo BSDLIBS = $BSDLIBS >> configure.log
 echo OBJC = $OBJC >> configure.log
 echo PIC_OBJC = $PIC_OBJC >> configure.log
 echo RANLIB = $RANLIB >> configure.log
@@ -824,7 +823,6 @@ sed < $SRCDIR/Makefile.in "
 /^includedir *=/s#=.*#= $includedir#
 /^mandir *=/s#=.*#= $mandir#
 /^SRCDIR *=/s#=.*#=$SRCDIR#
-/^BSDLIBS *=/s#=.*#=$BSDLIBS#
 /^INCLUDES *=/s#=.*#=$INCLUDES#
 /^OBJC *=/s#=.*#= $OBJC#
 /^PIC_OBJC *=/s#=.*#= $PIC_OBJC#

diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index b1571c969f66db3da2c9e03cf777db532995070b..10832948ddcfd65b8ec4708020f1f12020248ae6 100644 (file)
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -30,7 +30,7 @@ RCFLAGS = /dWIN32 /r
 DEFFILE = zlib.def
 WITH_GZFILEOP =
 
-OBJS = adler32.obj compress.obj crc32.obj deflate.obj \
+OBJS = adler32.obj compress.obj crc32.obj deflate.obj deflate_fast.obj deflate_slow.obj \
        infback.obj inflate.obj inftrees.obj inffast.obj match.obj trees.obj uncompr.obj zutil.obj x86.obj fill_window_sse.obj crc_folding.obj
 !if "$(WITH_GZFILEOP)" != ""
 WFLAGS = $(WFLAGS) -DWITH_GZFILEOP