Update MSVC 7.1 projects

[flightgear.git] / projects / VC7.1 / FlightGear.vcproj

diff --git a/projects/VC7.1/FlightGear.vcproj b/projects/VC7.1/FlightGear.vcproj
index e26551461db559853584d7a59d73a006e00e9732..a4b57a9f7a38f0158aedf5804505820677080042 100755 (executable)
--- a/projects/VC7.1/FlightGear.vcproj
+++ b/projects/VC7.1/FlightGear.vcproj
@@ -4,6 +4,7 @@
        Version="7.10"
        Name="FlightGear"
        ProjectGUID="{49142EAF-B264-4B9F-B096-F669999EBB2E}"
+       RootNamespace="FlightGear"
        SccProjectName=""
        SccLocalPath="">
        <Platforms>
@@ -23,7 +24,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\..\SimGear;&quot;..\..\..\pthreads-w32-2-7-0-release&quot;;..\..\src\FDM\JSBSim;..\..\..\OpenSceneGraph\include;..\..\..\OpenThreads\include;..\..\..\3rdParty\include"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;FG_PLIB_JOYSTICK_GETNAME;FG_NEW_ENVIRONMENT;FG_MPLAYER_AS;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;NO_FG_JPEG_SERVER"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                StringPooling="TRUE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -42,7 +43,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386"
-                               AdditionalDependencies="glut32.lib wsock32.lib sg_d.lib net_d.lib ssg_d.lib pui_d.lib puaux_d.lib fnt_d.lib js_d.lib ul_d.lib zlibd.lib pthreadVC2d.lib OpenAL32.lib ALut.lib libjpegd.lib osgd.lib osgDBd.lib osgUtild.lib"
+                               AdditionalDependencies="glut32.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 pthreadVC2d.lib OpenAL32.lib ALut.lib libjpegd.lib osgd.lib osgDBd.lib osgUtild.lib libjpegd.lib"
                                OutputFile="Debug/fgfs.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
@@ -87,7 +88,7 @@
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\src\FDM\JSBSim;..\..\..\SimGear;&quot;..\..\..\pthreads-w32-2-7-0-release&quot;;..\..\..\OpenSceneGraph\include;..\..\..\Producer\include;..\..\..\OpenThreads\include;..\..\..\3rdParty\include"
-                               PreprocessorDefinitions="HAVE_CONFIG_H;FGFS;NDEBUG;WIN32;_CONSOLE;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;FG_PLIB_JOYSTICK_GETNAME;FG_NEW_ENVIRONMENT;ENABLE_THREADS=1;FG_MPLAYER_AS;FG_USE_CLOUDS_3D;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="TRUE"
@@ -104,7 +105,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386"
-                               AdditionalDependencies="glut32.lib wsock32.lib sg.lib net.lib ssg.lib pui.lib puAux.lib fnt.lib js.lib ul.lib zlib.lib pthreadVC2.lib OpenAL32.lib ALut.lib osg.lib osgDB.lib osgUtil.lib"
+                               AdditionalDependencies="glut32.lib wsock32.lib sg.lib net.lib pui.lib puAux.lib fnt.lib js.lib ul.lib zlib.lib pthreadVC2.lib OpenAL32.lib ALut.lib osg.lib osgDB.lib osgUtil.lib libjpeg.lib"
                                OutputFile=".\Release/fgfs.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -480,6 +481,12 @@
                                <File
                                        RelativePath="..\..\src\Fdm\JSBSim\math\FGColumnVector3.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\math\FGCondition.cpp">
+                               </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\math\FGCondition.h">
+                               </File>
                                <File
                                        RelativePath="..\..\src\Fdm\JSBSim\math\FGFunction.cpp">
                                </File>
@@ -635,12 +642,6 @@
                                <Filter
                                        Name="flight_control"
                                        Filter="">
-                                       <File
-                                               RelativePath="..\..\src\Fdm\JSBSim\models\flight_control\FGCondition.cpp">
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\Fdm\JSBSim\models\flight_control\FGCondition.h">
-                                       </File>
                                        <File
                                                RelativePath="..\..\src\Fdm\JSBSim\models\flight_control\FGDeadBand.cpp">
                                        </File>
@@ -683,6 +684,12 @@
                                        <File
                                                RelativePath="..\..\src\Fdm\JSBSim\models\flight_control\FGKinemat.h">
                                        </File>
+                                       <File
+                                               RelativePath="..\..\src\Fdm\JSBSim\models\flight_control\FGPID.cpp">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\src\Fdm\JSBSim\models\flight_control\FGPID.h">
+                                       </File>
                                        <File
                                                RelativePath="..\..\src\Fdm\JSBSim\models\flight_control\FGSensor.cpp">
                                        </File>
@@ -1546,6 +1553,12 @@
                        <File
                                RelativePath="..\..\src\Fdm\YASim\Ground.hpp">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Fdm\YASim\Hitch.cpp">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Fdm\YASim\Hitch.hpp">
+                       </File>
                        <File
                                RelativePath="..\..\src\Fdm\YASim\Hook.cpp">
                        </File>
@@ -1981,6 +1994,12 @@
                        <File
                                RelativePath="..\..\src\Network\joyclient.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Network\jpg-httpd.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Network\jpg-httpd.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\Network\jsclient.cxx">
                        </File>
@@ -2187,6 +2206,24 @@
                <Filter
                        Name="Lib_Environment"
                        Filter="">
+                       <File
+                               RelativePath="..\..\src\Environment\atmosphere.cxx">
+                               <FileConfiguration
+                                       Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+                               </FileConfiguration>
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Environment\atmosphere.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\Environment\environment.cxx">
                        </File>
@@ -2277,12 +2314,6 @@
                        <File
                                RelativePath="..\..\src\Instrumentation\altimeter.hxx">
                        </File>
-                       <File
-                               RelativePath="..\..\src\Instrumentation\annunciator.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\src\Instrumentation\annunciator.hxx">
-                       </File>
                        <File
                                RelativePath="..\..\src\Instrumentation\attitude_indicator.cxx">
                        </File>
@@ -2319,12 +2350,6 @@
                        <File
                                RelativePath="..\..\src\Instrumentation\dme.hxx">
                        </File>
-                       <File
-                               RelativePath="..\..\src\Instrumentation\encoder.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\src\Instrumentation\encoder.hxx">
-                       </File>
                        <File
                                RelativePath="..\..\src\Instrumentation\gps.cxx">
                        </File>
@@ -2788,7 +2813,25 @@
                        </File>
                </Filter>
                <File
-                       RelativePath="..\..\src\Include\config.h-msvc6">
+                       RelativePath="..\..\src\Include\config.h-msvc71">
+                       <FileConfiguration
+                               Name="Debug|Win32">
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                                       Description="Generation of config.h"
+                                       CommandLine="copy $(inputPath) $(InputDir)\$(InputName).h
+"
+                                       Outputs="..\..\src\Include\config.h"/>
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|Win32">
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                                       Description="Generation of config.h"
+                                       CommandLine="copy $(inputPath) $(InputDir)\$(InputName).h
+"
+                                       Outputs="..\..\src\Include\config.h"/>
+                       </FileConfiguration>
                </File>
                <File
                        RelativePath="flightgear.ico">