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 /PCbuild | |
| 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 'PCbuild')
| -rw-r--r-- | PCbuild/select.vcproj | 16 | ||||
| -rw-r--r-- | PCbuild/xxlimited.vcproj | 12 |
2 files changed, 14 insertions, 14 deletions
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"
|