From b988305dcb36bae2190c56fc41a6668f583da428 Mon Sep 17 00:00:00 2001
From: frohlich <frohlich>
Date: Wed, 30 May 2007 13:17:31 +0000
Subject: [PATCH] Modified Files: 	projects/VC8/FGJS.vcproj
 projects/VC8/FlightGear.vcproj 	projects/VC8/FlightGearLib.vcproj
 projects/VC8/JS_demo.vcproj: 	Olaf Flebbe: win32 build system.

---
 projects/VC8/FlightGear.vcproj    | 24 ++++++++++++------------
 projects/VC8/FlightGearLib.vcproj | 16 ++++++++++------
 projects/VC8/JS_demo.vcproj       |  4 ++--
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/projects/VC8/FlightGear.vcproj b/projects/VC8/FlightGear.vcproj
index 07456a50e..4df3c855c 100755
--- a/projects/VC8/FlightGear.vcproj
+++ b/projects/VC8/FlightGear.vcproj
@@ -60,7 +60,7 @@
 			/>
 			<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.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"
+				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 osgGAd.lib osgViewerd.lib osgUtild.lib osgParticled.lib osgTextd.lib osgd.lib OpenThreadsd.lib libjpeg.lib pthreadvc2.lib Alut.lib openal32.lib glu32.lib opengl32.lib winmm.lib zlib1.lib wsock32.lib advapi32.lib comdlg32.lib shell32.lib user32.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;$(ProgramFiles)/OpenThreads/lib;$(ProgramFiles)/OpenSceneGraph/lib;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib"
 				IgnoreDefaultLibraryNames="libcmt.lib"
@@ -138,8 +138,8 @@
 			/>
 			<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.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"
+				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 osgGA.lib osgViewer.lib osgUtil.lib osgParticle.lib osgText.lib osg.lib OpenThreads.lib pthreadvc2.lib Alut.lib openal32.lib glu32.lib opengl32.lib winmm.lib zlib1.lib libjpeg.lib wsock32.lib advapi32.lib comdlg32.lib shell32.lib user32.lib"
+				LinkIncremental="0"
 				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"
@@ -202,6 +202,10 @@
 				RelativePath="..\..\src\main\fg_props.hxx"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\Main\FGManipulator.hxx"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\main\globals.hxx"
 				>
@@ -267,13 +271,17 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\main\fg_os.cxx"
+				RelativePath="..\..\src\Main\fg_os_osgviewer.cxx"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\main\fg_props.cxx"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\Main\FGManipulator.cxx"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\main\globals.cxx"
 				>
@@ -298,14 +306,6 @@
 				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 3e038cf65..ad85a7f30 100755
--- a/projects/VC8/FlightGearLib.vcproj
+++ b/projects/VC8/FlightGearLib.vcproj
@@ -857,11 +857,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\Instrumentation\HUD\HUD.hxx"
+				RelativePath="..\..\src\cockpit\hud.hxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\cockpit\hud.hxx"
+				RelativePath="..\..\src\Instrumentation\HUD\HUD.hxx"
 				>
 			</File>
 			<File
@@ -1276,6 +1276,10 @@
 				RelativePath="..\..\src\network\ray.hxx"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\Scenery\redout.hxx"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\instrumentation\render_area_2d.hxx"
 				>
@@ -1944,10 +1948,6 @@
 				RelativePath="..\..\src\atc\ATCDialog.cxx"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\atc\ATCdisplay.cxx"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\atc\ATCmgr.cxx"
 				>
@@ -3018,6 +3018,10 @@
 				RelativePath="..\..\src\network\ray.cxx"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\Scenery\redout.cxx"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\instrumentation\render_area_2d.cxx"
 				>
diff --git a/projects/VC8/JS_demo.vcproj b/projects/VC8/JS_demo.vcproj
index 966427925..f4807553b 100644
--- a/projects/VC8/JS_demo.vcproj
+++ b/projects/VC8/JS_demo.vcproj
@@ -60,7 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="js_d.lib ul_d.lib advapi32.lib comdlg32.lib shell32.lib user32.lib winmm.lib"
+				AdditionalDependencies="js.lib ul.lib advapi32.lib comdlg32.lib shell32.lib user32.lib winmm.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../../plib"
 				GenerateDebugInformation="true"
@@ -123,7 +123,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX;FREEGLUT_STATIC"
 				StringPooling="true"
 				MinimalRebuild="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				BufferSecurityCheck="true"
 				EnableEnhancedInstructionSet="0"
 				FloatingPointModel="2"
-- 
2.39.5