Joystick code now in the Flightgear tree

diff --git a/projects/VC90/FlightGear/FlightGear.vcproj b/projects/VC90/FlightGear/FlightGear.vcproj
index fc364e8513ab0d00817f5b5dd496b30b715d85dc..39b57a134ef2f238ed7bf0a5037fe0bfde5402e6 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"\r
+                               AdditionalDependencies="opengl32.lib glu32.lib winmm.lib wsock32.lib sg_d.lib pui_d.lib puaux_d.lib fnt_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
@@ -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 wsock32.lib sg_d.lib pui_d.lib puaux_d.lib fnt_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"\r
+                               AdditionalDependencies="opengl32.lib glu32.lib winmm.lib wsock32.lib sg.lib pui.lib puAux.lib fnt.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
@@ -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 wsock32.lib sg.lib pui.lib puAux.lib fnt.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
@@ -2613,6 +2613,10 @@
                                RelativePath="..\..\..\src\Input\FGJoystickInput.hxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\src\Input\FGjs.hxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\src\Input\FGKeyboardInput.cxx"\r
                                >\r
@@ -2637,6 +2641,14 @@
                                RelativePath="..\..\..\src\Input\input.hxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\src\Input\js.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\src\Input\jsWindows.cxx"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="main"\r

diff --git a/projects/VC90/fgjs/fgjs.vcproj b/projects/VC90/fgjs/fgjs.vcproj
index 4b65db591c36010a9010e7204a5ab390ba4f1491..879361416435004d4eb1c2b59410ff2c01a9e85d 100644 (file)
--- a/projects/VC90/fgjs/fgjs.vcproj
+++ b/projects/VC90/fgjs/fgjs.vcproj
@@ -67,7 +67,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="sg_d.lib js_d.lib ul_d.lib zlibd.lib winmm.lib ws2_32.lib OpenThreadsd.lib"\r
+                               AdditionalDependencies="sg_d.lib ul_d.lib zlibd.lib winmm.lib ws2_32.lib OpenThreadsd.lib"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="..\..\..\..\install\msvc90\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib"\r
                                GenerateDebugInformation="true"\r
@@ -148,7 +148,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="sg_d.lib js_d.lib ul_d.lib zlibd.lib winmm.lib ws2_32.lib OpenThreadsd.lib"\r
+                               AdditionalDependencies="sg_d.lib ul_d.lib zlibd.lib winmm.lib ws2_32.lib OpenThreadsd.lib"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib"\r
                                GenerateDebugInformation="true"\r
@@ -225,7 +225,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="sg.lib js.lib ul.lib zlib.lib winmm.lib ws2_32.lib OpenThreads.lib"\r
+                               AdditionalDependencies="sg.lib ul.lib zlib.lib winmm.lib ws2_32.lib OpenThreads.lib"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="..\..\..\..\install\msvc90\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib"\r
                                GenerateDebugInformation="true"\r
@@ -304,7 +304,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="sg.lib js.lib ul.lib zlib.lib winmm.lib ws2_32.lib OpenThreads.lib"\r
+                               AdditionalDependencies="sg.lib ul.lib zlib.lib winmm.lib ws2_32.lib OpenThreads.lib"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="..\..\..\..\install\msvc90-64\OpenSceneGraph\lib;..\..\..\..\3rdParty.x64\lib"\r
                                GenerateDebugInformation="true"\r
@@ -350,6 +350,10 @@
                                RelativePath="..\..\..\src\Input\fgjs.cxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\src\Input\js.cxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\src\Input\jsinput.cxx"\r
                                >\r
@@ -358,12 +362,20 @@
                                RelativePath="..\..\..\src\Input\jssuper.cxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\src\Input\jsWindows.cxx"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\..\src\Input\FGjs.hxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\src\Input\jsinput.h"\r
                                >\r