Skip to content

C
cpython
Commit 4fd87f29 authored by Martin v. Löwis's avatar Martin v. Löwis
Browse files
Options

More updates for zlib 1.2.1

parent 3a106f19
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
PCbuild/zlib.vcproj
View file @ 4fd87f29
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
OutputFile="./zlib_d.pyd" OutputFile="./zlib_d.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc;msvcrt"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./zlib_d.pdb" ProgramDatabaseFile=".\./zlib_d.pdb"
SubSystem="2" SubSystem="2"
...@@ -110,7 +110,7 @@ nmake -nologo -f win32\Makefile.msc zlib.lib ...@@ -110,7 +110,7 @@ nmake -nologo -f win32\Makefile.msc zlib.lib
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="..\..\zlib-1.1.4\zlib.lib" AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
OutputFile="./zlib.pyd" OutputFile="./zlib.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
...@@ -136,8 +136,8 @@ nmake -nologo -f win32\Makefile.msc zlib.lib ...@@ -136,8 +136,8 @@ nmake -nologo -f win32\Makefile.msc zlib.lib
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
Description="Checking static zlib has been built" Description="Checking static zlib has been built"
CommandLine="cd ..\..\zlib-1.1.4 CommandLine="cd ..\..\zlib-1.2.1
nmake -nologo -f msdos\makefile.w32 zlib.lib nmake -nologo -f win32\Makefile.msc zlib.lib
"/> "/>
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7