projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1ee1719)
Make all socket related modules link with ws2_32.lib on windows, like
authorKristján Valur Jónsson <kristjan@ccpgames.com>
Sun, 15 Apr 2012 11:12:57 +0000 (11:12 +0000)
committerKristján Valur Jónsson <kristjan@ccpgames.com>
Sun, 15 Apr 2012 11:12:57 +0000 (11:12 +0000)
_socket does.  Some were using the older wsock32.lib.

PC/VS7.1/select.vcproj patch | blob | history
PC/VS8.0/select.vcproj patch | blob | history
PCbuild/select.vcproj patch | blob | history
PCbuild/xxlimited.vcproj patch | blob | history

diff --git a/PC/VS7.1/select.vcproj b/PC/VS7.1/select.vcproj
index 325e425d3beb4b5ebaf0b118291e47d8eeb419c0..8252d45c7bf35895b06de807eed66aea56d64413 100644 (file)
--- a/PC/VS7.1/select.vcproj
+++ b/PC/VS7.1/select.vcproj
@@ -35,7 +35,7 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                OutputFile="./select.pyd"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
@@ -89,7 +89,7 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                OutputFile="./select_d.pyd"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
@@ -151,7 +151,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                OutputFile="./select.pyd"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
@@ -213,7 +213,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                OutputFile="./select.pyd"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
diff --git a/PC/VS8.0/select.vcproj b/PC/VS8.0/select.vcproj
index 76a98ae048a0271d6e7de71e4b0accc8b1f535a7..671fc166cc8fb51b3a2f61a925192e587e390dbd 100644 (file)
--- a/PC/VS8.0/select.vcproj
+++ b/PC/VS8.0/select.vcproj
@@ -54,7 +54,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -116,7 +116,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -178,7 +178,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -241,7 +241,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -303,7 +303,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -366,7 +366,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                                TargetMachine="17"\r
@@ -429,7 +429,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -492,7 +492,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                                TargetMachine="17"\r
diff --git a/PCbuild/select.vcproj b/PCbuild/select.vcproj
index 9b67a35e4647f53f62324b5bc8be087cec67b836..02e0a2fc40f4918e131291f459341ed50181f08c 100644 (file)
--- a/PCbuild/select.vcproj
+++ b/PCbuild/select.vcproj
@@ -54,7 +54,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -116,7 +116,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -178,7 +178,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -241,7 +241,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -303,7 +303,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -366,7 +366,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                                TargetMachine="17"\r
@@ -429,7 +429,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -492,7 +492,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                                TargetMachine="17"\r
diff --git a/PCbuild/xxlimited.vcproj b/PCbuild/xxlimited.vcproj
index dc923e8e4d734df3bc58623fb9317c5821e009a4..6da20160130de53feb5a810645fd02456b409c68 100644 (file)
--- a/PCbuild/xxlimited.vcproj
+++ b/PCbuild/xxlimited.vcproj
@@ -56,7 +56,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -182,7 +182,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -245,7 +245,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                                TargetMachine="17"\r
@@ -309,7 +309,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                        />\r
@@ -372,7 +372,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                BaseAddress="0x1D110000"\r
                                TargetMachine="17"\r
Unnamed repository; edit this file 'description' to name the repository.