]> granicus.if.org Git - python/commitdiff
More updates for zlib 1.2.1
authorMartin v. Löwis <martin@v.loewis.de>
Sat, 17 Jan 2004 11:20:17 +0000 (11:20 +0000)
committerMartin v. Löwis <martin@v.loewis.de>
Sat, 17 Jan 2004 11:20:17 +0000 (11:20 +0000)
PCbuild/zlib.vcproj

index dac296c496011fb3485badd8d8f00b3ec514615a..b505d8424e3712fce376c968d02caec315a43910 100644 (file)
@@ -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"