[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2: use ws2_32.lib rather than wsock32.lib on windows.
kristjan.jonsson
python-checkins at python.org
Sun Apr 15 13:17:01 CEST 2012
http://hg.python.org/cpython/rev/ab0aff639cfb
changeset: 76318:ab0aff639cfb
parent: 76316:72902ab938e0
parent: 76317:1cce16c79de2
user: Kristján Valur Jónsson <kristjan at ccpgames.com>
date: Sun Apr 15 11:14:46 2012 +0000
summary:
Merge with 3.2: use ws2_32.lib rather than wsock32.lib on windows.
files:
PC/VS7.1/select.vcproj | 8 ++++----
PC/VS8.0/select.vcproj | 16 ++++++++--------
PCbuild/select.vcproj | 16 ++++++++--------
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
--- 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
--- 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
--- 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
--- 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"
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list