mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge with 3.2: use ws2_32.lib rather than wsock32.lib on windows.

Browse source
This commit is contained in:
Kristján Valur Jónsson 2012-04-15 11:14:46 +00:00
commit c014df7edf
4 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PC/VS7.1/select.vcproj
View file

@ -35,7 +35,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="./select.pyd" OutputFile="./select.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@ -89,7 +89,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="./select_d.pyd" OutputFile="./select_d.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@ -151,7 +151,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="./select.pyd" OutputFile="./select.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@ -213,7 +213,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="./select.pyd" OutputFile="./select.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"

16
PC/VS8.0/select.vcproj
View file

@ -54,7 +54,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -116,7 +116,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -178,7 +178,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -241,7 +241,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -303,7 +303,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -366,7 +366,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
TargetMachine="17" TargetMachine="17"
@ -429,7 +429,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -492,7 +492,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
TargetMachine="17" TargetMachine="17"

16
PCbuild/select.vcproj
View file

@ -54,7 +54,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -116,7 +116,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -178,7 +178,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -241,7 +241,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -303,7 +303,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -366,7 +366,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
TargetMachine="17" TargetMachine="17"
@ -429,7 +429,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -492,7 +492,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
TargetMachine="17" TargetMachine="17"

12
PCbuild/xxlimited.vcproj
View file

@ -56,7 +56,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -119,7 +119,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -182,7 +182,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -245,7 +245,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
TargetMachine="17" TargetMachine="17"
@ -309,7 +309,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
/> />
@ -372,7 +372,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000" BaseAddress="0x1D110000"
TargetMachine="17" TargetMachine="17"