Merge branch 'timoore/ptrfix'

[flightgear.git] / projects / VC90 / FlightGear / FlightGear.vcproj

diff --git a/projects/VC90/FlightGear/FlightGear.vcproj b/projects/VC90/FlightGear/FlightGear.vcproj
index 2bc8734090aa73bc76df41708c0b3a797659e006..d85b591de5b5e6fb35e3fdbcc7397a8302504c48 100644 (file)
--- a/projects/VC90/FlightGear/FlightGear.vcproj
+++ b/projects/VC90/FlightGear/FlightGear.vcproj
@@ -48,7 +48,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_39_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"
+                               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;ENABLE_ATCDCL"
                                StringPooling="true"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -137,7 +137,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\include;..\..\..\..\SimGear;..\..\..\src\FDM\JSBSim;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_39_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"
+                               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;ENABLE_ATCDCL"
                                StringPooling="true"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -225,7 +225,7 @@
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_39_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"
+                               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;ENABLE_ATCDCL"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
@@ -313,7 +313,7 @@
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\include;..\..\..\src\FDM\JSBSim;..\..\..\..\SimGear;..\..\..\..\install\msvc90-64\OpenSceneGraph\include;..\..\..\..\3rdParty.x64\include;..\..\..\..\boost_1_39_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"
+                               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;ENABLE_ATCDCL"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
@@ -1024,6 +1024,14 @@
                                        RelativePath="..\..\..\src\Fdm\JSBSim\models\FGGroundReactions.h"
                                        >
                                </File>
+                               <File
+                                       RelativePath="..\..\..\src\FDM\JSBSim\models\flight_control\FGGyro.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\src\FDM\JSBSim\models\flight_control\FGGyro.h"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\..\..\src\Fdm\JSBSim\models\FGInertial.cpp"
                                        >
@@ -1048,6 +1056,14 @@
                                        RelativePath="..\..\..\src\Fdm\JSBSim\models\FGLGear.h"
                                        >
                                </File>
+                               <File
+                                       RelativePath="..\..\..\src\FDM\JSBSim\models\flight_control\FGMagnetometer.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\..\src\FDM\JSBSim\models\flight_control\FGMagnetometer.h"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\..\..\src\Fdm\JSBSim\models\FGMassBalance.cpp"
                                        >
@@ -1088,6 +1104,10 @@
                                        RelativePath="..\..\..\src\Fdm\JSBSim\models\FGPropulsion.h"
                                        >
                                </File>
+                               <File
+                                       RelativePath="..\..\..\src\FDM\JSBSim\models\flight_control\FGSensorOrientation.h"
+                                       >
+                               </File>
                                <Filter
                                        Name="atmosphere"
                                        >
@@ -3205,6 +3225,14 @@
                                RelativePath="..\..\..\src\Sound\morse.hxx"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\..\src\Sound\sample_queue.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\Sound\sample_queue.hxx"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\src\Sound\voice.cxx"
                                >
@@ -3909,6 +3937,14 @@
                                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"
                                >
@@ -3929,6 +3965,14 @@
                                RelativePath="..\..\..\src\AIModel\AIFlightPlanCreatePushBack.cxx"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\..\src\AIModel\AIGroundVehicle.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\AIModel\AIGroundVehicle.hxx"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\src\AIModel\AIManager.cxx"
                                >
@@ -4207,7 +4251,7 @@
                        </File>
                </Filter>
                <File
-                       RelativePath="..\..\..\src\Include\config.h-msvc71"
+                       RelativePath="..\..\..\src\Include\config.h-msvc90"
                        >
                        <FileConfiguration
                                Name="Debug|Win32"
@@ -4253,10 +4297,82 @@
                <File
                        RelativePath="..\flightgear.ico"
                        >
+                       <FileConfiguration
+                               Name="Debug|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
                </File>
                <File
                        RelativePath="..\flightgear.rc"
                        >
+                       <FileConfiguration
+                               Name="Debug|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCResourceCompilerTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCResourceCompilerTool"
+                               />
+                       </FileConfiguration>
+               </File>
+               <File
+                       RelativePath="..\flightgear64.ico"
+                       >
+                       <FileConfiguration
+                               Name="Debug|Win32"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|Win32"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+               </File>
+               <File
+                       RelativePath="..\flightgear64.rc"
+                       >
+                       <FileConfiguration
+                               Name="Debug|Win32"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCResourceCompilerTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|Win32"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCResourceCompilerTool"
+                               />
+                       </FileConfiguration>
                </File>
        </Files>
        <Globals>