From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 17 Aug 2004 16:39:04 +0000 (+0000)
Subject:   Require zlib to be pre-compiled, and rely upon the srclib/zlib/
X-Git-Tag: STRIKER_2_1_0_RC1~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5d80b8cbc654058acf9cf185adf309a2d146dce;p=apache

  Require zlib to be pre-compiled, and rely upon the srclib/zlib/
  tree to contain zlib.lib and our .h files.

  This presumes that zlib is compiled to be compatible with Apache
  (msvcrt build, either statics or as zlib1.dll).  It's true of
  all 1.2.1 zlibs and later.


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

diff --git a/modules/filters/mod_deflate.dsp b/modules/filters/mod_deflate.dsp
index d703f8934b..e139ff7866 100644
--- 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 /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so /opt:ref
+# ADD LINK32 kernel32.lib zlib.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_deflate.so" /libpath:"../../srclib/zlib" /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 /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
 
 !ENDIF 
 
@@ -87,54 +87,6 @@ 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