diff options
| author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-04-15 11:12:57 (GMT) |
|---|---|---|
| committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-04-15 11:12:57 (GMT) |
| commit | 473fde60dc5cfbd5f41e462c587b08c10ce51764 (patch) | |
| tree | 000062653755ccba8c56b9ada6d3b8154db485da | |
| parent | 1ee17198c818c33b482a680d38a53a40c38d3054 (diff) | |
| download | cpython-473fde60dc5cfbd5f41e462c587b08c10ce51764.zip cpython-473fde60dc5cfbd5f41e462c587b08c10ce51764.tar.gz cpython-473fde60dc5cfbd5f41e462c587b08c10ce51764.tar.bz2 | |
Make all socket related modules link with ws2_32.lib on windows, like
_socket does. Some were using the older wsock32.lib.
| -rw-r--r-- | PC/VS7.1/select.vcproj | 8 | ||||
| -rw-r--r-- | PC/VS8.0/select.vcproj | 16 | ||||
| -rw-r--r-- | PCbuild/select.vcproj | 16 | ||||
| -rw-r--r-- | PCbuild/xxlimited.vcproj | 12 |
4 files changed, 26 insertions, 26 deletions
diff --git a/PC/VS7.1/select.vcproj b/PC/VS7.1/select.vcproj index 325e425..8252d45 100644 --- a/PC/VS7.1/select.vcproj +++ b/PC/VS7.1/select.vcproj @@ -35,7 +35,7 @@ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
OutputFile="./select.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -89,7 +89,7 @@ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
OutputFile="./select_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -151,7 +151,7 @@ <Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
OutputFile="./select.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -213,7 +213,7 @@ <Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
OutputFile="./select.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/PC/VS8.0/select.vcproj b/PC/VS8.0/select.vcproj index 76a98ae..671fc16 100644 --- a/PC/VS8.0/select.vcproj +++ b/PC/VS8.0/select.vcproj @@ -54,7 +54,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -116,7 +116,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -178,7 +178,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -241,7 +241,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -303,7 +303,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -366,7 +366,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
TargetMachine="17"
@@ -429,7 +429,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -492,7 +492,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
TargetMachine="17"
diff --git a/PCbuild/select.vcproj b/PCbuild/select.vcproj index 9b67a35..02e0a2f 100644 --- a/PCbuild/select.vcproj +++ b/PCbuild/select.vcproj @@ -54,7 +54,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -116,7 +116,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -178,7 +178,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -241,7 +241,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -303,7 +303,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -366,7 +366,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
TargetMachine="17"
@@ -429,7 +429,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -492,7 +492,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
TargetMachine="17"
diff --git a/PCbuild/xxlimited.vcproj b/PCbuild/xxlimited.vcproj index dc923e8..6da2016 100644 --- a/PCbuild/xxlimited.vcproj +++ b/PCbuild/xxlimited.vcproj @@ -56,7 +56,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -119,7 +119,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -182,7 +182,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -245,7 +245,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
TargetMachine="17"
@@ -309,7 +309,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
/>
@@ -372,7 +372,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
TargetMachine="17"
|