From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 17 Jan 2004 11:20:17 +0000 (+0000)
Subject: More updates for zlib 1.2.1
X-Git-Tag: v2.4a1~935
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09de7567269af82164ec7dd0c5edf3ec6d1b7502;p=thirdparty%2FPython%2Fcpython.git

More updates for zlib 1.2.1
---

diff --git a/PCbuild/zlib.vcproj b/PCbuild/zlib.vcproj
index dac296c49601..b505d8424e37 100644
--- a/PCbuild/zlib.vcproj
+++ b/PCbuild/zlib.vcproj
@@ -41,7 +41,7 @@
 				OutputFile="./zlib_d.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				IgnoreDefaultLibraryNames="libc"
+				IgnoreDefaultLibraryNames="libc;msvcrt"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\./zlib_d.pdb"
 				SubSystem="2"
@@ -110,7 +110,7 @@ nmake -nologo -f win32\Makefile.msc zlib.lib
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\zlib-1.1.4\zlib.lib"
+				AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
 				OutputFile="./zlib.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -136,8 +136,8 @@ nmake -nologo -f win32\Makefile.msc zlib.lib
 			<Tool
 				Name="VCPreLinkEventTool"
 				Description="Checking static zlib has been built"
-				CommandLine="cd ..\..\zlib-1.1.4
-nmake -nologo -f msdos\makefile.w32 zlib.lib
+				CommandLine="cd ..\..\zlib-1.2.1
+nmake -nologo -f win32\Makefile.msc zlib.lib
 "/>
 			<Tool
 				Name="VCResourceCompilerTool"