Merge branch 'topic/tape' into next

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

diff --git a/projects/VC7.1/FlightGear.vcproj b/projects/VC7.1/FlightGear.vcproj
index abee5a6cff97575aef96f184545caf6181673048..8c6d099adabbed275630b9a0d0d699f8bd741541 100755 (executable)
--- a/projects/VC7.1/FlightGear.vcproj
+++ b/projects/VC7.1/FlightGear.vcproj
@@ -23,7 +23,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\..\SimGear;&quot;..\..\..\pthreads-w32-2-7-0-release&quot;;..\..\src\FDM\JSBSim;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\3rdParty\include"
+                               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"
                                StringPooling="TRUE"
                                BasicRuntimeChecks="0"
@@ -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"
+                               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="Debug/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;..\..\..\install\OpenThreads\lib;..\..\..\plib;..\..\..\SimGear\Debug;..\..\..\OpenSceneGraph\lib\win32;..\..\..\3rdParty\lib"
                                IgnoreDefaultLibraryNames=""
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile=".\Debug/FlightGear.pdb"
@@ -87,7 +87,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\src\FDM\JSBSim;..\..\..\SimGear;&quot;..\..\..\pthreads-w32-2-7-0-release&quot;;..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\Producer\include;..\..\..\3rdParty\include"
+                               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"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
@@ -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"
+                               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=".\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;..\..\..\install\OpenThreads\lib;..\..\..\plib;..\..\..\SimGear\Release;..\..\..\OpenSceneGraph\lib\win32;..\..\..\3rdParty\lib"
                                IgnoreDefaultLibraryNames=""
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile=".\Release/FlightGear.pdb"
@@ -204,6 +204,12 @@
                        <File
                                RelativePath="..\..\src\Airports\parking.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\Airports\runwaybase.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\Airports\runwaybase.hxx">
+                       </File>
                        <File
                                RelativePath="..\..\src\Airports\runwayprefloader.cxx">
                        </File>
@@ -1853,10 +1859,10 @@
                                RelativePath="..\..\src\Main\fg_props.hxx">
                        </File>
                        <File
-                               RelativePath="..\..\src\Main\FGManipulator.cxx">
+                               RelativePath="..\..\src\Main\FGEventHandler.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\src\Main\FGManipulator.hxx">
+                               RelativePath="..\..\src\Main\FGEventHandler.hxx">
                        </File>
                        <File
                                RelativePath="..\..\src\Main\globals.cxx">
@@ -1958,6 +1964,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>
@@ -2016,6 +2028,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>