Merge branch 'timoore/fire-fix' into next

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

diff --git a/projects/VC7.1/FlightGear.vcproj b/projects/VC7.1/FlightGear.vcproj
index 68e27560b877245fec51689466649c6fff517c07..388947077cb05e8ad41e840d4dfdeed7569a7999 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;..\..\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"
+                               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"
@@ -47,7 +47,7 @@
                                OutputFile="$(OutDir)/fgfs.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\install\OpenThreads\lib;..\..\..\plib;..\..\..\SimGear\Debug;..\..\..\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;..\..\..\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"
+                               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"
@@ -110,7 +110,7 @@
                                OutputFile="bin/Release/fgfs.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\install\OpenThreads\lib;..\..\..\plib;..\..\..\SimGear\Release;..\..\..\OpenSceneGraph\lib\win32;..\..\..\3rdParty\lib"
+                               AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\3rdParty\lib"
                                IgnoreDefaultLibraryNames=""
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile=".\Release/FlightGear.pdb"
@@ -204,6 +204,12 @@
                        <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>
@@ -368,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>
@@ -679,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>
@@ -1808,6 +1826,8 @@
                        <File
                                RelativePath="..\..\src\GUI\SafeTexFont.hxx">
                        </File>
+                       <File RelativePath="..\..\..\src\GUI\WaypointList.cxx"></File>
+                       <File RelativePath="..\..\..\src\GUI\WaypointList.hxx"></File>
                </Filter>
                <Filter
                        Name="Lib_Input"
@@ -1864,6 +1884,13 @@
                        <File
                                RelativePath="..\..\src\Main\fg_props.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Main\fgviewer.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Main\fgviewer.hxx">
+                       </File>
+
                        <File
                                RelativePath="..\..\src\Main\FGEventHandler.cxx">
                        </File>
@@ -1933,12 +1960,6 @@
                        <File
                                RelativePath="..\..\src\Main\viewmgr.hxx">
                        </File>
-                       <File
-                               RelativePath="..\..\src\Main\ViewPartitionNode.cxx">
-                       </File>
-                       <File
-                               RelativePath="..\..\src\Main\ViewPartitionNode.hxx">
-                       </File>
                        <File
                                RelativePath="..\..\src\Main\WindowBuilder.cxx">
                        </File>
@@ -2312,6 +2333,12 @@
                        <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>
@@ -2710,6 +2737,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>
@@ -2731,12 +2765,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>
@@ -2779,6 +2807,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>