Merge branch 'csaba/nan'

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

diff --git a/projects/VC7.1/FlightGear.vcproj b/projects/VC7.1/FlightGear.vcproj
index 2741f318c7b1a12f66d6a2053bb979c05cef17f7..9d0a96735e1ce98161a85c04fa718d5a7d8dc647 100755 (executable)
--- a/projects/VC7.1/FlightGear.vcproj
+++ b/projects/VC7.1/FlightGear.vcproj
@@ -23,8 +23,8 @@
                        <Tool
                                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;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               AdditionalIncludeDirectories="..\..\src;..\..\src\include;..\..\..\SimGear;..\..\src\FDM\JSBSim;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include;..\..\..\boost_1_36_0"
+                               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;PU_USE_NATIVE"
                                StringPooling="TRUE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -43,11 +43,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386"
-                               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 pthreadVC2d.lib OpenAL32.lib ALut.lib osgd.lib osgDBd.lib osgUtild.lib osgViewerd.lib osgGAd.lib osgTextd.lib osgParticled.lib OpenThreadsd.lib libjpegd.lib"
-                               OutputFile="Debug/fgfs.exe"
+                               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"
+                               OutputFile="$(OutDir)/fgfs.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\install\OpenThreads\lib;..\..\..\plib;..\..\..\SimGear\Debug;&quot;..\..\..\pthreads-w32-2-7-0-release&quot;;..\..\..\OpenSceneGraph\lib\win32;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                IgnoreDefaultLibraryNames=""
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile=".\Debug/FlightGear.pdb"
@@ -87,8 +87,8 @@
                        <Tool
                                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="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"
+                               AdditionalIncludeDirectories="..\..\src;..\..\src\include;..\..\src\FDM\JSBSim;..\..\..\SimGear;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\Producer\include;..\..\..\3rdParty\include;..\..\..\boost_1_36_0"
+                               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;PU_USE_NATIVE"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="TRUE"
@@ -106,11 +106,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386"
-                               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 pthreadVC2.lib OpenAL32.lib ALut.lib osg.lib osgDB.lib osgUtil.lib osgViewer.lib osgGA.lib osgText.lib osgParticle.lib OpenThreads.lib libjpeg.lib"
-                               OutputFile=".\Release/fgfs.exe"
+                               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"
+                               OutputFile="bin/Release/fgfs.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\install\OpenThreads\lib;..\..\..\plib;..\..\..\SimGear\Release;&quot;..\..\..\pthreads-w32-2-7-0-release&quot;;..\..\..\OpenSceneGraph\lib\win32;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                IgnoreDefaultLibraryNames=""
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile=".\Release/FlightGear.pdb"
@@ -204,6 +204,18 @@
                        <File
                                RelativePath="..\..\src\Airports\parking.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Airports\pavement.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Airports\pavement.hxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Airports\runwaybase.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Airports\runwaybase.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\Airports\runwayprefloader.cxx">
                        </File>
@@ -223,16 +235,16 @@
                                RelativePath="..\..\src\Airports\runways.hxx">
                        </File>
                        <File
-                               RelativePath="..\..\src\Airports\simple.cxx">
+                               RelativePath="..\..\src\Airports\sidstar.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\src\Airports\simple.hxx">
+                               RelativePath="..\..\src\Airports\sidstar.hxx">
                        </File>
                        <File
-                               RelativePath="..\..\src\Airports\trafficcontrol.cxx">
+                               RelativePath="..\..\src\Airports\simple.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\src\Airports\trafficcontrol.hxx">
+                               RelativePath="..\..\src\Airports\simple.hxx">
                        </File>
                        <File
                                RelativePath="..\..\src\Airports\xmlloader.cxx">
@@ -362,6 +374,12 @@
                <Filter
                        Name="Lib_Autopilot"
                        Filter="">
+                       <File
+                               RelativePath="..\..\src\Autopilot\autobrake.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Autopilot\autobrake.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\Autopilot\route_mgr.cxx">
                        </File>
@@ -414,9 +432,6 @@
                        <File
                                RelativePath="..\..\src\Cockpit\hud_ladr.cxx">
                        </File>
-                       <File
-                               RelativePath="..\..\src\Cockpit\hud_opts.hxx">
-                       </File>
                        <File
                                RelativePath="..\..\src\Cockpit\hud_rwy.cxx">
                        </File>
@@ -455,16 +470,6 @@
                                </File>
                        </Filter>
                </Filter>
-               <Filter
-                       Name="Lib_Balloon"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\src\FDM\Balloon\BalloonSim.cpp">
-                       </File>
-                       <File
-                               RelativePath="..\..\src\FDM\Balloon\BalloonSim.h">
-                       </File>
-               </Filter>
                <Filter
                        Name="Lib_JSBSim"
                        Filter="">
@@ -580,12 +585,36 @@
                                <File
                                        RelativePath="..\..\src\Fdm\JSBSim\models\FGAuxiliary.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\models\FGBuoyantForces.cpp">
+                               </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\models\FGBuoyantForces.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\models\FGExternalForce.cpp">
+                               </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\models\FGExternalForce.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\models\FGExternalReactions.cpp">
+                               </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\models\FGExternalReactions.h">
+                               </File>
                                <File
                                        RelativePath="..\..\src\Fdm\JSBSim\models\FGFCS.cpp">
                                </File>
                                <File
                                        RelativePath="..\..\src\Fdm\JSBSim\models\FGFCS.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\models\FGGasCell.cpp">
+                               </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\models\FGGasCell.h">
+                               </File>
                                <File
                                        RelativePath="..\..\src\Fdm\JSBSim\models\FGGroundReactions.cpp">
                                </File>
@@ -662,6 +691,12 @@
                                <Filter
                                        Name="flight_control"
                                        Filter="">
+                                       <File
+                                               RelativePath="..\..\src\Fdm\JSBSim\models\flight_control\FGAccelerometer.cpp">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\src\Fdm\JSBSim\models\flight_control\FGAccelerometer.h">
+                                       </File>
                                        <File
                                                RelativePath="..\..\src\Fdm\JSBSim\models\flight_control\FGActuator.cpp">
                                        </File>
@@ -845,12 +880,18 @@
                                <File
                                        RelativePath="..\..\src\Fdm\JSBSim\input_output\FGXMLElement.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\input_output\FGXMLFileRead.h">
+                               </File>
                                <File
                                        RelativePath="..\..\src\Fdm\JSBSim\input_output\FGXMLParse.cpp">
                                </File>
                                <File
                                        RelativePath="..\..\src\Fdm\JSBSim\input_output\FGXMLParse.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\src\Fdm\JSBSim\input_output\net_fdm.hxx">
+                               </File>
                        </Filter>
                        <Filter
                                Name="initialization"
@@ -1706,12 +1747,6 @@
                <Filter
                        Name="Lib_Flight"
                        Filter="">
-                       <File
-                               RelativePath="..\..\src\FDM\Balloon.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\src\FDM\Balloon.h">
-                       </File>
                        <File
                                RelativePath="..\..\src\FDM\flight.cxx">
                        </File>
@@ -1724,12 +1759,6 @@
                        <File
                                RelativePath="..\..\src\Fdm\groundcache.hxx">
                        </File>
-                       <File
-                               RelativePath="..\..\src\FDM\MagicCarpet.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\src\FDM\MagicCarpet.hxx">
-                       </File>
                        <File
                                RelativePath="..\..\src\FDM\NullFDM.cxx">
                        </File>
@@ -1764,12 +1793,6 @@
                        <File
                                RelativePath="..\..\src\GUI\gui_funcs.cxx">
                        </File>
-                       <File
-                               RelativePath="..\..\src\GUI\gui_local.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\src\GUI\gui_local.hxx">
-                       </File>
                        <File
                                RelativePath="..\..\src\GUI\layout-props.cxx">
                        </File>
@@ -1785,9 +1808,6 @@
                        <File
                                RelativePath="..\..\src\GUI\menubar.hxx">
                        </File>
-                       <File
-                               RelativePath="..\..\src\GUI\mouse.cxx">
-                       </File>
                        <File
                                RelativePath="..\..\src\GUI\new_gui.cxx">
                        </File>
@@ -1800,19 +1820,12 @@
                        <File
                                RelativePath="..\..\src\Gui\property_list.hxx">
                        </File>
-                       <File
-                               RelativePath="..\..\src\GUI\trackball.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\src\GUI\trackball.h">
-                       </File>
                        <File
                                RelativePath="..\..\src\GUI\SafeTexFont.cxx">
                        </File>
                        <File
                                RelativePath="..\..\src\GUI\SafeTexFont.hxx">
                        </File>
-
                </Filter>
                <Filter
                        Name="Lib_Input"
@@ -1830,6 +1843,12 @@
                        <File
                                RelativePath="..\..\src\Main\bootstrap.cxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Main\CameraGroup.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Main\CameraGroup.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\Main\fg_commands.cxx">
                        </File>
@@ -1864,10 +1883,17 @@
                                RelativePath="..\..\src\Main\fg_props.hxx">
                        </File>
                        <File
-                               RelativePath="..\..\src\Main\FGManipulator.cxx">
+                               RelativePath="..\..\src\Main\fgviewer.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\src\Main\FGManipulator.hxx">
+                               RelativePath="..\..\src\Main\fgviewer.hxx">
+                       </File>
+
+                       <File
+                               RelativePath="..\..\src\Main\FGEventHandler.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Main\FGEventHandler.hxx">
                        </File>
                        <File
                                RelativePath="..\..\src\Main\globals.cxx">
@@ -1933,10 +1959,16 @@
                                RelativePath="..\..\src\Main\viewmgr.hxx">
                        </File>
                        <File
-                               RelativePath="..\..\src\Main\ViewPartitionNode.cxx">
+                               RelativePath="..\..\src\Main\WindowBuilder.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Main\WindowBuilder.hxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Main\WindowSystemAdapter.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\src\Main\ViewPartitionNode.hxx">
+                               RelativePath="..\..\src\Main\WindowSystemAdapter.hxx">
                        </File>
                </Filter>
                <Filter
@@ -1957,6 +1989,12 @@
                        <File
                                RelativePath="..\..\src\Navaids\fixlist.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Navaids\markerbeacon.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Navaids\markerbeacon.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\Navaids\nav.hxx">
                        </File>
@@ -1972,6 +2010,15 @@
                        <File
                                RelativePath="..\..\src\Navaids\navlist.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Navaids\navrecord.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Navaids\positioned.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Navaids\positioned.hxx">
+                       </File>
                </Filter>
                <Filter
                        Name="Lib_Network"
@@ -2006,6 +2053,12 @@
                        <File
                                RelativePath="..\..\src\Network\AV400.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Network\AV400Sim.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Network\AV400Sim.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\Network\garmin.cxx">
                        </File>
@@ -2189,12 +2242,6 @@
                <Filter
                        Name="Lib_Time"
                        Filter="">
-                       <File
-                               RelativePath="..\..\src\Time\fg_timer.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\src\Time\fg_timer.hxx">
-                       </File>
                        <File
                                RelativePath="..\..\src\Time\light.cxx">
                        </File>
@@ -2284,12 +2331,24 @@
                        <File
                                RelativePath="..\..\src\Environment\fgmetar.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Environment\fgwind.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Environment\fgwind.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\Environment\precipitation_mgr.cxx">
                        </File>
                        <File
                                RelativePath="..\..\src\Environment\precipitation_mgr.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Environment\ridge_lift.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Environment\ridge_lift.hxx">
+                       </File>
                </Filter>
                <Filter
                        Name="Lib_Model"
@@ -2676,6 +2735,13 @@
                        <File
                                RelativePath="..\..\src\AIModel\AICarrier.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\AIModel\AIEscort.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\AIModel\AIEscort.hxx">
+                       </File>
+
                        <File
                                RelativePath="..\..\src\AIModel\AIFlightPlan.cxx">
                        </File>
@@ -2697,12 +2763,6 @@
                        <File
                                RelativePath="..\..\src\AIModel\AIManager.hxx">
                        </File>
-                       <File
-                               RelativePath="..\..\src\AIModel\AIModelData.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\src\AIModel\AIModelData.hxx">
-                       </File>
                        <File
                                RelativePath="..\..\src\AIModel\AIMultiplayer.cxx">
                        </File>
@@ -2745,6 +2805,12 @@
                        <File
                                RelativePath="..\..\src\AIModel\AIWingman.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\AIModel\AIGroundVehicle.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\AIModel\AIGroundVehicle.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\AIModel\performancedata.cxx">
                        </File>
@@ -2899,6 +2965,16 @@
                                RelativePath="..\..\src\Instrumentation\Kln89\kln89_symbols.hxx">
                        </File>
                </Filter>
+               <Filter
+                       Name="Lib_ATC"
+                       Filter="">
+                       <File
+                               RelativePath="..\..\src\Atc\trafficcontrol.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Atc\trafficcontrol.hxx">
+                       </File>
+               </Filter>
                <File
                        RelativePath="..\..\src\Include\config.h-msvc71">
                        <FileConfiguration