Update VisualStudio projects to link against Winsock2 instead of Winsock1

diff --git a/projects/VC90/FlightGear/FlightGear.vcproj b/projects/VC90/FlightGear/FlightGear.vcproj
index 198f15b7e4e2745730f531ab301a10ccec435f1e..c2e799c8d883b139d2bd02b0bd6e8bac3cc965ee 100644 (file)
--- a/projects/VC90/FlightGear/FlightGear.vcproj
+++ b/projects/VC90/FlightGear/FlightGear.vcproj
@@ -73,7 +73,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="opengl32.lib glu32.lib winmm.lib wsock32.lib sg_d.lib net_d.lib pui_d.lib puaux_d.lib fnt_d.lib js_d.lib ul_d.lib zlibd.lib OpenAL32.lib ALut.lib osgd.lib osgDBd.lib osgUtild.lib osgViewerd.lib osgGAd.lib osgTextd.lib osgParticled.lib OpenThreadsd.lib libjpegd.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib"\r
+                               AdditionalDependencies="opengl32.lib glu32.lib winmm.lib ws2_32.lib sg_d.lib net_d.lib pui_d.lib puaux_d.lib fnt_d.lib js_d.lib ul_d.lib zlibd.lib OpenAL32.lib ALut.lib osgd.lib osgDBd.lib osgUtild.lib osgViewerd.lib osgGAd.lib osgTextd.lib osgParticled.lib OpenThreadsd.lib libjpegd.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib"\r
                                OutputFile="$(OutDir)\fgfs.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
@@ -161,7 +161,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="opengl32.lib glu32.lib winmm.lib wsock32.lib sg_d.lib net_d.lib pui_d.lib puaux_d.lib fnt_d.lib js_d.lib ul_d.lib zlibd.lib OpenAL32.lib ALut.lib osgd.lib osgDBd.lib osgUtild.lib osgViewerd.lib osgGAd.lib osgTextd.lib osgParticled.lib OpenThreadsd.lib libjpegd.lib"\r
+                               AdditionalDependencies="opengl32.lib glu32.lib winmm.lib ws2_32.lib sg_d.lib net_d.lib pui_d.lib puaux_d.lib fnt_d.lib js_d.lib ul_d.lib zlibd.lib OpenAL32.lib ALut.lib osgd.lib osgDBd.lib osgUtild.lib osgViewerd.lib osgGAd.lib osgTextd.lib osgParticled.lib OpenThreadsd.lib libjpegd.lib"\r
                                OutputFile="$(OutDir)\fgfs.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
@@ -249,7 +249,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="opengl32.lib glu32.lib winmm.lib wsock32.lib sg.lib net.lib pui.lib puAux.lib fnt.lib js.lib ul.lib zlib.lib OpenAL32.lib ALut.lib osg.lib osgDB.lib osgUtil.lib osgViewer.lib osgGA.lib osgText.lib osgParticle.lib OpenThreads.lib libjpeg.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib"\r
+                               AdditionalDependencies="opengl32.lib glu32.lib winmm.lib ws2_32.lib sg.lib net.lib pui.lib puAux.lib fnt.lib js.lib ul.lib zlib.lib OpenAL32.lib ALut.lib osg.lib osgDB.lib osgUtil.lib osgViewer.lib osgGA.lib osgText.lib osgParticle.lib OpenThreads.lib libjpeg.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib"\r
                                OutputFile="$(OutDir)\fgfs.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
@@ -336,7 +336,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="opengl32.lib glu32.lib winmm.lib wsock32.lib sg.lib net.lib pui.lib puAux.lib fnt.lib js.lib ul.lib zlib.lib OpenAL32.lib ALut.lib osg.lib osgDB.lib osgUtil.lib osgViewer.lib osgGA.lib osgText.lib osgParticle.lib OpenThreads.lib libjpeg.lib"\r
+                               AdditionalDependencies="opengl32.lib glu32.lib winmm.lib ws2_32.lib sg.lib net.lib pui.lib puAux.lib fnt.lib js.lib ul.lib zlib.lib OpenAL32.lib ALut.lib osg.lib osgDB.lib osgUtil.lib osgViewer.lib osgGA.lib osgText.lib osgParticle.lib OpenThreads.lib libjpeg.lib"\r
                                OutputFile="$(OutDir)\fgfs.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r

diff --git a/projects/VC90/fgadmin/fgadmin.vcproj b/projects/VC90/fgadmin/fgadmin.vcproj
index a7d8f4e092e64bfe46749b6798f4c967153f11dc..0cc986c9a93ba477ba47ddec135d49ca14f57ee6 100644 (file)
--- a/projects/VC90/fgadmin/fgadmin.vcproj
+++ b/projects/VC90/fgadmin/fgadmin.vcproj
@@ -65,7 +65,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="fltkd.lib comctl32.lib wsock32.lib zlibd.lib"
+                               AdditionalDependencies="fltkd.lib comctl32.lib ws2_32.lib zlibd.lib"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="..\..\..\..\3rdParty\lib"
                                GenerateDebugInformation="true"
@@ -145,7 +145,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="fltkd.lib comctl32.lib wsock32.lib zlibd.lib"
+                               AdditionalDependencies="fltkd.lib comctl32.lib ws2_32.lib zlibd.lib"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="..\..\..\..\3rdParty.x64\lib"
                                GenerateDebugInformation="true"
@@ -226,7 +226,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="fltk.lib comctl32.lib wsock32.lib zlib.lib"
+                               AdditionalDependencies="fltk.lib comctl32.lib ws2_32.lib zlib.lib"
                                LinkIncremental="1"
                                AdditionalLibraryDirectories="..\..\..\..\3rdParty\lib"
                                GenerateDebugInformation="false"
@@ -309,7 +309,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="fltk.lib comctl32.lib wsock32.lib zlib.lib"
+                               AdditionalDependencies="fltk.lib comctl32.lib ws2_32.lib zlib.lib"
                                LinkIncremental="1"
                                AdditionalLibraryDirectories="..\..\..\..\3rdParty.x64\lib"
                                GenerateDebugInformation="false"

diff --git a/projects/VC90/fgpanel/fgpanel.vcproj b/projects/VC90/fgpanel/fgpanel.vcproj
index bc09aff717f5fe41f0f52ad2c852d2b5e6826f78..ffa22c3624b930ac1dcae7316fff1b1fe4e5d49b 100755 (executable)
--- a/projects/VC90/fgpanel/fgpanel.vcproj
+++ b/projects/VC90/fgpanel/fgpanel.vcproj
@@ -61,7 +61,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib zlibd.lib libpngd.lib fnt_d.lib ul_d.lib sg_d.lib pui_d.lib"\r
+                               AdditionalDependencies="ws2_32.lib zlibd.lib libpngd.lib fnt_d.lib ul_d.lib sg_d.lib pui_d.lib"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="..\..\..\..\install\msvc90\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib"\r
                                GenerateDebugInformation="true"\r
@@ -137,7 +137,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wsock32.lib net.lib sg.lib pui.lib fnt.lib ul.lib libpng.lib zlib.lib "\r
+                               AdditionalDependencies="ws2_32.lib net.lib sg.lib pui.lib fnt.lib ul.lib libpng.lib zlib.lib "\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="..\..\..\..\install\msvc90\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib"\r
                                GenerateDebugInformation="true"\r