]> granicus.if.org Git - python/commitdiff
Updated PC/*/select.[dsp,vcproj] to follow r86136. (use winsock2)
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Thu, 4 Nov 2010 12:03:16 +0000 (12:03 +0000)
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Thu, 4 Nov 2010 12:03:16 +0000 (12:03 +0000)
PC/VC6/select.dsp
PC/VS7.1/select.vcproj
PC/VS8.0/select.vcproj

index d0e528c34942a304a629f4a0bde60f9c2c4310b4..890ea6f08fabcb66d2c8cd7252cf2e07d23e5ec0 100644 (file)
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D110000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./select.pyd"\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /base:"0x1D110000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./select.pyd"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "select - Win32 Debug"\r
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D110000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"msvcrt" /out:"./select_d.pyd" /pdbtype:sept\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /base:"0x1D110000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"msvcrt" /out:"./select_d.pyd" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r
index 0c18f60cda5d7dd049412ddee1cd8d6133023071..79c26f3acf4955f0e409998be3e4fa45185ce0e7 100644 (file)
@@ -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"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                OutputFile="./select.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                OutputFile="./select.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
index fb25a581e2722ddbaeacf23d72da20daffc46196..49ec2f0f8b0fceb3fbcd51666cf7add7e93ffaab 100644 (file)
@@ -54,7 +54,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                                TargetMachine="17"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                                TargetMachine="17"