diff options
| author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-04-15 11:14:46 (GMT) |
|---|---|---|
| committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-04-15 11:14:46 (GMT) |
| commit | c014df7edf9d2358f80b783f4556a117a41924c0 (patch) | |
| tree | 4f35176948311ac256cfba4c3807b3e0de6970bc /PC | |
| parent | acb2b0dc6782fd9f2f432a8c49e1ed8ab55ef3b2 (diff) | |
| parent | 473fde60dc5cfbd5f41e462c587b08c10ce51764 (diff) | |
| download | cpython-c014df7edf9d2358f80b783f4556a117a41924c0.zip cpython-c014df7edf9d2358f80b783f4556a117a41924c0.tar.gz cpython-c014df7edf9d2358f80b783f4556a117a41924c0.tar.bz2 | |
Merge with 3.2: use ws2_32.lib rather than wsock32.lib on windows.
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/VS7.1/select.vcproj | 8 | ||||
| -rw-r--r-- | PC/VS8.0/select.vcproj | 16 |
2 files changed, 12 insertions, 12 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"
|