Modified Files:

	projects/VC8/FlightGear.vcproj
	projects/VC8/FlightGearLib.vcproj Olaf Flebbe: Updates to the win32
        build system.

diff --git a/projects/VC8/FlightGear.vcproj b/projects/VC8/FlightGear.vcproj
index 3f083cd78ba1a5a0aaee99d391da65e00a734f2b..07456a50eaac48a8633ae2f3cdc2df1a48e01ba0 100755 (executable)
--- a/projects/VC8/FlightGear.vcproj
+++ b/projects/VC8/FlightGear.vcproj
@@ -39,11 +39,11 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PTW32_STATIC_LIB;OSG_LIBRARY_STATIC;PR_LIBRARY_STATIC;OT_LIBRARY_STATIC;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;NOMINMAX"\r
+                               AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;NOMINMAX"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -60,13 +60,13 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="FlightgearLib.lib Simgear.lib fnt.lib js.lib net.lib psl.lib puAux.lib pui.lib pw.lib sg.lib sl.lib ul.lib osgDBd_s.lib osgDB_jpegd_s.lib osgDB_rgbd_s.lib osgDB_acd_s.lib osgdb_txfd_s.lib osgUtild_s.lib osgParticled_s.lib osgTextd_s.lib osgd_s.lib OpenThreadsWin32d_s.lib libjpeg.lib pthreadvc2.lib Alut.lib openal32.lib zlib.lib wsock32.lib advapi32.lib comdlg32.lib shell32.lib user32.lib"\r
+                               AdditionalDependencies="FlightgearLib.lib Simgear.lib fnt.lib js.lib net.lib psl.lib puAux.lib pui.lib pw.lib sg.lib sl.lib ul.lib osgDBd.lib osgUtild.lib osgParticled.lib osgTextd.lib osgd.lib OpenThreadsd.lib libjpeg.lib pthreadvc2.lib Alut.lib openal32.lib zlib.lib wsock32.lib advapi32.lib comdlg32.lib shell32.lib user32.lib"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../OpenThreads/lib/win32;../../../OpenSceneGraph/lib/win32;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib"\r
+                               AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;$(ProgramFiles)/OpenThreads/lib;$(ProgramFiles)/OpenSceneGraph/lib;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib"\r
                                IgnoreDefaultLibraryNames="libcmt.lib"\r
-                               ForceSymbolReferences="?g_readerWriter_JPEG_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterJPEG@@@osgDB@@A;?g_readerWriter_AC_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterAC@@@osgDB@@A;?g_readerWriter_RGB_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterRGB@@@osgDB@@A;?g_readerWriter_TXF_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterTXF@@@osgDB@@A"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               LargeAddressAware="2"\r
                                TargetMachine="1"\r
                                FixedBaseAddress="1"\r
                        />\r
@@ -118,10 +118,10 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PTW32_STATIC_LIB;OSG_LIBRARY_STATIC;PR_LIBRARY_STATIC;OT_LIBRARY_STATIC;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"\r
+                               AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -138,10 +138,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="FlightgearLib.lib Simgear.lib fnt.lib js.lib net.lib psl.lib puAux.lib pui.lib pw.lib sg.lib sl.lib ul.lib osgDB_ac_s.lib osgDB_jpeg_s.lib osgDB_rgb_s.lib osgDB_txf_s.lib osgDB_s.lib osgUtil_s.lib osgParticle_s.lib osgText_s.lib osg_s.lib OpenThreadsWin32_s.lib pthreadvc2.lib Alut.lib openal32.lib zlib.lib libjpeg.lib wsock32.lib advapi32.lib comdlg32.lib shell32.lib user32.lib"\r
+                               AdditionalDependencies="FlightgearLib.lib Simgear.lib fnt.lib js.lib net.lib psl.lib puAux.lib pui.lib pw.lib sg.lib sl.lib ul.lib osgDB.lib osgUtil.lib osgParticle.lib osgText.lib osg.lib OpenThreads.lib pthreadvc2.lib Alut.lib openal32.lib zlib1.lib libjpeg.lib wsock32.lib advapi32.lib comdlg32.lib shell32.lib user32.lib"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../OpenThreads/lib/win32;../../../OpenSceneGraph/lib/win32;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib;$(NOINHERIT)"\r
-                               ForceSymbolReferences="?g_readerWriter_JPEG_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterJPEG@@@osgDB@@A;?g_readerWriter_AC_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterAC@@@osgDB@@A;?g_readerWriter_RGB_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterRGB@@@osgDB@@A;?g_readerWriter_TXF_Proxy@@3V?$RegisterReaderWriterProxy@VReaderWriterTXF@@@osgDB@@A"\r
+                               AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;$(ProgramFiles)/OpenThreads/lib;$(ProgramFiles)/OpenSceneGraph/lib;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib;$(NOINHERIT)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
@@ -299,6 +298,14 @@
                                RelativePath="..\..\src\main\splash.cxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\Memory_and_Exception_Trace\Stackwalker.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\Memory_and_Exception_Trace\Stackwalker.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\main\util.cxx"\r
                                >\r

diff --git a/projects/VC8/FlightGearLib.vcproj b/projects/VC8/FlightGearLib.vcproj
index c0a7c0315bfbe7db28987f1ebab895bf4200bfce..3e038cf65f4861865df4e663d471c9ae36cb0da7 100755 (executable)
--- a/projects/VC8/FlightGearLib.vcproj
+++ b/projects/VC8/FlightGearLib.vcproj
@@ -41,12 +41,12 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PTW32_STATIC_LIB;PR_LIBRARY_STATIC;OSG_LIBRARY_STATIC;OT_LIBRARY_STATIC;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"\r
+                               AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"\r
                                StringPooling="true"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -105,11 +105,11 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PTW32_STATIC_LIB;PR_LIBRARY_STATIC;OSG_LIBRARY_STATIC;OT_LIBRARY_STATIC;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"\r
+                               AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -857,11 +857,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\cockpit\hud.hxx"\r
+                               RelativePath="..\..\src\Instrumentation\HUD\HUD.hxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\Instrumentation\HUD\HUD.hxx"\r
+                               RelativePath="..\..\src\cockpit\hud.hxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1916,10 +1916,6 @@
                                RelativePath="..\..\src\instrumentation\altimeter.cxx"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\src\instrumentation\annunciator.cxx"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\atc\approach.cxx"\r
                                >\r
@@ -1984,6 +1980,28 @@
                                RelativePath="..\..\src\fdm\yasim\Atmosphere.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\Environment\atmosphere.cxx"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
+                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
+                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\instrumentation\attitude_indicator.cxx"\r
                                >\r
@@ -2100,10 +2118,6 @@
                                RelativePath="..\..\src\systems\electrical.cxx"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\src\instrumentation\encoder.cxx"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\environment\environment.cxx"\r
                                >\r