From 9271dcdb3f632658873c6284274cb3ac713bf800 Mon Sep 17 00:00:00 2001
From: frohlich <frohlich>
Date: Sat, 21 Apr 2007 12:25:19 +0000
Subject: [PATCH] Modified Files: 	projects/VC8/FlightGear.vcproj 
 projects/VC8/FlightGearLib.vcproj Olaf Flebbe: Updates to the win32        
 build system.

---
 projects/VC8/FlightGear.vcproj    | 31 +++++++++++++--------
 projects/VC8/FlightGearLib.vcproj | 46 ++++++++++++++++++++-----------
 2 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/projects/VC8/FlightGear.vcproj b/projects/VC8/FlightGear.vcproj
index 3f083cd78..07456a50e 100755
--- a/projects/VC8/FlightGear.vcproj
+++ b/projects/VC8/FlightGear.vcproj
@@ -39,11 +39,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
-				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"
+				AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;NOMINMAX"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -60,13 +60,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
+				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"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../OpenThreads/lib/win32;../../../OpenSceneGraph/lib/win32;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib"
+				AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;$(ProgramFiles)/OpenThreads/lib;$(ProgramFiles)/OpenSceneGraph/lib;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib"
 				IgnoreDefaultLibraryNames="libcmt.lib"
-				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"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				LargeAddressAware="2"
 				TargetMachine="1"
 				FixedBaseAddress="1"
 			/>
@@ -118,10 +118,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
-				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"
+				AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -138,10 +138,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
+				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"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../OpenThreads/lib/win32;../../../OpenSceneGraph/lib/win32;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib;$(NOINHERIT)"
-				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"
+				AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;$(ProgramFiles)/OpenThreads/lib;$(ProgramFiles)/OpenSceneGraph/lib;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib;$(NOINHERIT)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -299,6 +298,14 @@
 				RelativePath="..\..\src\main\splash.cxx"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\Memory_and_Exception_Trace\Stackwalker.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\Memory_and_Exception_Trace\Stackwalker.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\main\util.cxx"
 				>
diff --git a/projects/VC8/FlightGearLib.vcproj b/projects/VC8/FlightGearLib.vcproj
index c0a7c0315..3e038cf65 100755
--- a/projects/VC8/FlightGearLib.vcproj
+++ b/projects/VC8/FlightGearLib.vcproj
@@ -41,12 +41,12 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
-				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"
+				AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -105,11 +105,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../;../../../OpenThreads/include;../../../OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
-				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"
+				AdditionalIncludeDirectories="../../../;$(ProgramFiles)/OpenThreads/include;$(ProgramFiles)/OpenSceneGraph/include;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX"
 				StringPooling="true"
 				MinimalRebuild="false"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -857,11 +857,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\cockpit\hud.hxx"
+				RelativePath="..\..\src\Instrumentation\HUD\HUD.hxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\Instrumentation\HUD\HUD.hxx"
+				RelativePath="..\..\src\cockpit\hud.hxx"
 				>
 			</File>
 			<File
@@ -1916,10 +1916,6 @@
 				RelativePath="..\..\src\instrumentation\altimeter.cxx"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\instrumentation\annunciator.cxx"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\atc\approach.cxx"
 				>
@@ -1984,6 +1980,28 @@
 				RelativePath="..\..\src\fdm\yasim\Atmosphere.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\Environment\atmosphere.cxx"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\src\instrumentation\attitude_indicator.cxx"
 				>
@@ -2100,10 +2118,6 @@
 				RelativePath="..\..\src\systems\electrical.cxx"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\instrumentation\encoder.cxx"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\environment\environment.cxx"
 				>