Skip to content

C
cpython
Commit 473fde60 authored by Kristján Valur Jónsson's avatar Kristján Valur Jónsson
Browse files
Options

Make all socket related modules link with ws2_32.lib on windows, like 

_socket does.  Some were using the older wsock32.lib.
parent 1ee17198
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
PC/VS7.1/select.vcproj
View file @ 473fde60
...@@ -35,7 +35,7 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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"
......
PC/VS8.0/select.vcproj
View file @ 473fde60
...@@ -54,7 +54,7 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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"
......
PCbuild/select.vcproj
View file @ 473fde60
...@@ -54,7 +54,7 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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"
......
PCbuild/xxlimited.vcproj
View file @ 473fde60
...@@ -56,7 +56,7 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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"
......
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