Skip to content

Commit c014df7

Browse files
author
Kristján Valur Jónsson
committed
Merge with 3.2: use ws2_32.lib rather than wsock32.lib on windows.
2 parents acb2b0d + 473fde6 commit c014df7

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎PC/VS7.1/select.vcproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
Name="VCCustomBuildTool"/>
3636
<Tool
3737
Name="VCLinkerTool"
38-
AdditionalDependencies="wsock32.lib"
38+
AdditionalDependencies="ws2_32.lib"
3939
OutputFile="./select.pyd"
4040
LinkIncremental="1"
4141
SuppressStartupBanner="TRUE"
@@ -89,7 +89,7 @@
8989
Name="VCCustomBuildTool"/>
9090
<Tool
9191
Name="VCLinkerTool"
92-
AdditionalDependencies="wsock32.lib"
92+
AdditionalDependencies="ws2_32.lib"
9393
OutputFile="./select_d.pyd"
9494
LinkIncremental="1"
9595
SuppressStartupBanner="TRUE"
@@ -151,7 +151,7 @@
151151
<Tool
152152
Name="VCLinkerTool"
153153
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
154-
AdditionalDependencies="wsock32.lib"
154+
AdditionalDependencies="ws2_32.lib"
155155
OutputFile="./select.pyd"
156156
LinkIncremental="1"
157157
SuppressStartupBanner="TRUE"
@@ -213,7 +213,7 @@
213213
<Tool
214214
Name="VCLinkerTool"
215215
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
216-
AdditionalDependencies="wsock32.lib"
216+
AdditionalDependencies="ws2_32.lib"
217217
OutputFile="./select.pyd"
218218
LinkIncremental="1"
219219
SuppressStartupBanner="TRUE"

‎PC/VS8.0/select.vcproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
/>
5555
<Tool
5656
Name="VCLinkerTool"
57-
AdditionalDependencies="wsock32.lib"
57+
AdditionalDependencies="ws2_32.lib"
5858
IgnoreDefaultLibraryNames="libc"
5959
BaseAddress="0x1D110000"
6060
/>
@@ -116,7 +116,7 @@
116116
/>
117117
<Tool
118118
Name="VCLinkerTool"
119-
AdditionalDependencies="wsock32.lib"
119+
AdditionalDependencies="ws2_32.lib"
120120
IgnoreDefaultLibraryNames="libc"
121121
BaseAddress="0x1D110000"
122122
/>
@@ -178,7 +178,7 @@
178178
/>
179179
<Tool
180180
Name="VCLinkerTool"
181-
AdditionalDependencies="wsock32.lib"
181+
AdditionalDependencies="ws2_32.lib"
182182
IgnoreDefaultLibraryNames="libc"
183183
BaseAddress="0x1D110000"
184184
/>
@@ -241,7 +241,7 @@
241241
/>
242242
<Tool
243243
Name="VCLinkerTool"
244-
AdditionalDependencies="wsock32.lib"
244+
AdditionalDependencies="ws2_32.lib"
245245
IgnoreDefaultLibraryNames="libc"
246246
BaseAddress="0x1D110000"
247247
/>
@@ -303,7 +303,7 @@
303303
/>
304304
<Tool
305305
Name="VCLinkerTool"
306-
AdditionalDependencies="wsock32.lib"
306+
AdditionalDependencies="ws2_32.lib"
307307
IgnoreDefaultLibraryNames="libc"
308308
BaseAddress="0x1D110000"
309309
/>
@@ -366,7 +366,7 @@
366366
/>
367367
<Tool
368368
Name="VCLinkerTool"
369-
AdditionalDependencies="wsock32.lib"
369+
AdditionalDependencies="ws2_32.lib"
370370
IgnoreDefaultLibraryNames="libc"
371371
BaseAddress="0x1D110000"
372372
TargetMachine="17"
@@ -429,7 +429,7 @@
429429
/>
430430
<Tool
431431
Name="VCLinkerTool"
432-
AdditionalDependencies="wsock32.lib"
432+
AdditionalDependencies="ws2_32.lib"
433433
IgnoreDefaultLibraryNames="libc"
434434
BaseAddress="0x1D110000"
435435
/>
@@ -492,7 +492,7 @@
492492
/>
493493
<Tool
494494
Name="VCLinkerTool"
495-
AdditionalDependencies="wsock32.lib"
495+
AdditionalDependencies="ws2_32.lib"
496496
IgnoreDefaultLibraryNames="libc"
497497
BaseAddress="0x1D110000"
498498
TargetMachine="17"

‎PCbuild/select.vcproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
/>
5555
<Tool
5656
Name="VCLinkerTool"
57-
AdditionalDependencies="wsock32.lib"
57+
AdditionalDependencies="ws2_32.lib"
5858
IgnoreDefaultLibraryNames="libc"
5959
BaseAddress="0x1D110000"
6060
/>
@@ -116,7 +116,7 @@
116116
/>
117117
<Tool
118118
Name="VCLinkerTool"
119-
AdditionalDependencies="wsock32.lib"
119+
AdditionalDependencies="ws2_32.lib"
120120
IgnoreDefaultLibraryNames="libc"
121121
BaseAddress="0x1D110000"
122122
/>
@@ -178,7 +178,7 @@
178178
/>
179179
<Tool
180180
Name="VCLinkerTool"
181-
AdditionalDependencies="wsock32.lib"
181+
AdditionalDependencies="ws2_32.lib"
182182
IgnoreDefaultLibraryNames="libc"
183183
BaseAddress="0x1D110000"
184184
/>
@@ -241,7 +241,7 @@
241241
/>
242242
<Tool
243243
Name="VCLinkerTool"
244-
AdditionalDependencies="wsock32.lib"
244+
AdditionalDependencies="ws2_32.lib"
245245
IgnoreDefaultLibraryNames="libc"
246246
BaseAddress="0x1D110000"
247247
/>
@@ -303,7 +303,7 @@
303303
/>
304304
<Tool
305305
Name="VCLinkerTool"
306-
AdditionalDependencies="wsock32.lib"
306+
AdditionalDependencies="ws2_32.lib"
307307
IgnoreDefaultLibraryNames="libc"
308308
BaseAddress="0x1D110000"
309309
/>
@@ -366,7 +366,7 @@
366366
/>
367367
<Tool
368368
Name="VCLinkerTool"
369-
AdditionalDependencies="wsock32.lib"
369+
AdditionalDependencies="ws2_32.lib"
370370
IgnoreDefaultLibraryNames="libc"
371371
BaseAddress="0x1D110000"
372372
TargetMachine="17"
@@ -429,7 +429,7 @@
429429
/>
430430
<Tool
431431
Name="VCLinkerTool"
432-
AdditionalDependencies="wsock32.lib"
432+
AdditionalDependencies="ws2_32.lib"
433433
IgnoreDefaultLibraryNames="libc"
434434
BaseAddress="0x1D110000"
435435
/>
@@ -492,7 +492,7 @@
492492
/>
493493
<Tool
494494
Name="VCLinkerTool"
495-
AdditionalDependencies="wsock32.lib"
495+
AdditionalDependencies="ws2_32.lib"
496496
IgnoreDefaultLibraryNames="libc"
497497
BaseAddress="0x1D110000"
498498
TargetMachine="17"

‎PCbuild/xxlimited.vcproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
/>
5757
<Tool
5858
Name="VCLinkerTool"
59-
AdditionalDependencies="wsock32.lib"
59+
AdditionalDependencies="ws2_32.lib"
6060
IgnoreDefaultLibraryNames="libc"
6161
BaseAddress="0x1D110000"
6262
/>
@@ -119,7 +119,7 @@
119119
/>
120120
<Tool
121121
Name="VCLinkerTool"
122-
AdditionalDependencies="wsock32.lib"
122+
AdditionalDependencies="ws2_32.lib"
123123
IgnoreDefaultLibraryNames="libc"
124124
BaseAddress="0x1D110000"
125125
/>
@@ -182,7 +182,7 @@
182182
/>
183183
<Tool
184184
Name="VCLinkerTool"
185-
AdditionalDependencies="wsock32.lib"
185+
AdditionalDependencies="ws2_32.lib"
186186
IgnoreDefaultLibraryNames="libc"
187187
BaseAddress="0x1D110000"
188188
/>
@@ -245,7 +245,7 @@
245245
/>
246246
<Tool
247247
Name="VCLinkerTool"
248-
AdditionalDependencies="wsock32.lib"
248+
AdditionalDependencies="ws2_32.lib"
249249
IgnoreDefaultLibraryNames="libc"
250250
BaseAddress="0x1D110000"
251251
TargetMachine="17"
@@ -309,7 +309,7 @@
309309
/>
310310
<Tool
311311
Name="VCLinkerTool"
312-
AdditionalDependencies="wsock32.lib"
312+
AdditionalDependencies="ws2_32.lib"
313313
IgnoreDefaultLibraryNames="libc"
314314
BaseAddress="0x1D110000"
315315
/>
@@ -372,7 +372,7 @@
372372
/>
373373
<Tool
374374
Name="VCLinkerTool"
375-
AdditionalDependencies="wsock32.lib"
375+
AdditionalDependencies="ws2_32.lib"
376376
IgnoreDefaultLibraryNames="libc"
377377
BaseAddress="0x1D110000"
378378
TargetMachine="17"

0 commit comments

Comments
 (0)