summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2004-01-17 11:20:17 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2004-01-17 11:20:17 (GMT)
commit09de7567269af82164ec7dd0c5edf3ec6d1b7502 (patch)
treeda8e4440890f9a0aad52a854445e31942a6c1433
parent21eca430836babf4ace697479799a7fdf35dcd4c (diff)
downloadcpython-09de7567269af82164ec7dd0c5edf3ec6d1b7502.zip
cpython-09de7567269af82164ec7dd0c5edf3ec6d1b7502.tar.gz
cpython-09de7567269af82164ec7dd0c5edf3ec6d1b7502.tar.bz2
More updates for zlib 1.2.1
-rw-r--r--PCbuild/zlib.vcproj8
1 files changed, 4 insertions, 4 deletions
diff --git a/PCbuild/zlib.vcproj b/PCbuild/zlib.vcproj
index dac296c..b505d84 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"