revert the zlib.lib linkage patch. Bill Rowe said, it's worse than before.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102385 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.win b/Makefile.win
index ec76d9ce408880335fb984e923e0d833649c1bf9..5cd348df8d037070f0456103efe32236d019cf11 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -81,14 +81,6 @@ _tryssl:
 !IF EXIST("srclib\zlib")
 
 _tryzlib:
-       cd srclib\zlib
-!IF EXIST("srclib\zlib\Win32\Makefile.msc") 
-       $(MAKE) $(MAKEOPT) -f Win32\Makefile.msc zlib.lib 
-!ELSE
-       $(MAKE) $(MAKEOPT) -f msdos\Makefile.w32 zlib.lib 
-!ENDIF
-       cd ..\..
-
 !IF EXIST("modules\filters\mod_deflate.mak")
        cd modules\filters
        $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 .\$(LONG)\mod_deflate.so
@@ -250,17 +242,8 @@ _build:
         $(MAKE) $(MAKEOPT) -f util_ldap.mak       CFG="util_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_auth_ldap.mak   CFG="mod_auth_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
-
-!IF EXIST("srclib\zlib")
-       cd srclib\zlib
-!IF EXIST("srclib\zlib\Win32\Makefile.msc") 
-       $(MAKE) $(MAKEOPT) -f Win32\Makefile.msc zlib.lib 
-!ELSE
-       $(MAKE) $(MAKEOPT) -f msdos\Makefile.w32 zlib.lib 
-!ENDIF
-       cd ..\..
-
        cd modules\filters
+!IF EXIST("srclib\zlib")
         $(MAKE) $(MAKEOPT) -f mod_deflate.mak     CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !ENDIF
         $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak  CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -345,13 +328,6 @@ _build:
        devenv Apache.sln /useenv $(CTARGET) $(LONG) /project abs
 !ENDIF
 !IF EXIST("srclib\zlib")
-       cd srclib\zlib
-!IF EXIST("srclib\zlib\Win32\Makefile.msc") 
-       $(MAKE) $(MAKEOPT) -f Win32\Makefile.msc zlib.lib 
-!ELSE
-       $(MAKE) $(MAKEOPT) -f msdos\Makefile.w32 zlib.lib 
-!ENDIF
-       cd ..\..
        devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_deflate
 !ENDIF
 
@@ -379,13 +355,6 @@ _build:
                "abs - Win32 $(LONG)" /NORECURSE $(CTARGET)
 !ENDIF
 !IF EXIST("srclib\zlib")
-       cd srclib\zlib
-!IF EXIST("srclib\zlib\Win32\Makefile.msc") 
-       $(MAKE) $(MAKEOPT) -f Win32\Makefile.msc zlib.lib 
-!ELSE
-       $(MAKE) $(MAKEOPT) -f msdos\Makefile.w32 zlib.lib 
-!ENDIF
-       cd ..\..
        @msdev Apache.dsw /USEENV /MAKE \
                "mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET)
 !ENDIF

diff --git a/modules/filters/mod_deflate.dsp b/modules/filters/mod_deflate.dsp
index a4fa1dd36b72f0eb70470465539ee180ce73b88e..d703f8934bfd38ba583de081249c55ef463a4dc3 100644 (file)
--- a/modules/filters/mod_deflate.dsp
+++ b/modules/filters/mod_deflate.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so
-# ADD LINK32 kernel32.lib zlib.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Release/mod_deflate.so" /libpath:"..\..\srclib\zlib" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so /opt:ref
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so /opt:ref
 
 !ELSEIF  "$(CFG)" == "mod_deflate - Win32 Debug"
 
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so
-# ADD LINK32 kernel32.lib zlib.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_deflate.so" /libpath:"..\..\srclib\zlib" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so
 
 !ENDIF 
 
@@ -87,6 +87,54 @@ LINK32=link.exe
 
 # Name "mod_deflate - Win32 Release"
 # Name "mod_deflate - Win32 Debug"
+# Begin Group "zlib"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\srclib\zlib\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\srclib\zlib\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\srclib\zlib\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\srclib\zlib\infblock.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\srclib\zlib\infcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\srclib\zlib\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\srclib\zlib\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\srclib\zlib\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\srclib\zlib\infutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\srclib\zlib\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\srclib\zlib\zutil.c
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=.\mod_deflate.c