Modified Files:

	projects/VC8/FGJS.vcproj projects/VC8/FlightGear.vcproj
	projects/VC8/FlightGearLib.vcproj projects/VC8/JS_demo.vcproj:
	Olaf Flebbe: win32 build system.

diff --git a/projects/VC8/FlightGear.vcproj b/projects/VC8/FlightGear.vcproj
index 07456a50eaac48a8633ae2f3cdc2df1a48e01ba0..4df3c855c9adfb4352f00714a06d7ec3c8b50c9b 100755 (executable)
--- a/projects/VC8/FlightGear.vcproj
+++ b/projects/VC8/FlightGear.vcproj
@@ -60,7 +60,7 @@
                        />\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.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
+                               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"\r
                                LinkIncremental="2"\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
@@ -138,8 +138,8 @@
                        />\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.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
+                               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"\r
+                               LinkIncremental="0"\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
@@ -202,6 +202,10 @@
                                RelativePath="..\..\src\main\fg_props.hxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\Main\FGManipulator.hxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\main\globals.hxx"\r
                                >\r
@@ -267,13 +271,17 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\main\fg_os.cxx"\r
+                               RelativePath="..\..\src\Main\fg_os_osgviewer.cxx"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\main\fg_props.cxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\Main\FGManipulator.cxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\main\globals.cxx"\r
                                >\r
@@ -298,14 +306,6 @@
                                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 3e038cf65f4861865df4e663d471c9ae36cb0da7..ad85a7f30b4988c6cf360360d1dbaeef2c7fe98e 100755 (executable)
--- a/projects/VC8/FlightGearLib.vcproj
+++ b/projects/VC8/FlightGearLib.vcproj
@@ -857,11 +857,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\Instrumentation\HUD\HUD.hxx"\r
+                               RelativePath="..\..\src\cockpit\hud.hxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\cockpit\hud.hxx"\r
+                               RelativePath="..\..\src\Instrumentation\HUD\HUD.hxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1276,6 +1276,10 @@
                                RelativePath="..\..\src\network\ray.hxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\Scenery\redout.hxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\instrumentation\render_area_2d.hxx"\r
                                >\r
@@ -1944,10 +1948,6 @@
                                RelativePath="..\..\src\atc\ATCDialog.cxx"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\src\atc\ATCdisplay.cxx"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\atc\ATCmgr.cxx"\r
                                >\r
@@ -3018,6 +3018,10 @@
                                RelativePath="..\..\src\network\ray.cxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\Scenery\redout.cxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\instrumentation\render_area_2d.cxx"\r
                                >\r

diff --git a/projects/VC8/JS_demo.vcproj b/projects/VC8/JS_demo.vcproj
index 966427925936fb0dc5c2524a8cc6c39a8b3fad6e..f4807553bf8f85f0b33679f86203f45d2889a76d 100644 (file)
--- a/projects/VC8/JS_demo.vcproj
+++ b/projects/VC8/JS_demo.vcproj
@@ -60,7 +60,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="js_d.lib ul_d.lib advapi32.lib comdlg32.lib shell32.lib user32.lib winmm.lib"\r
+                               AdditionalDependencies="js.lib ul.lib advapi32.lib comdlg32.lib shell32.lib user32.lib winmm.lib"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="../../../plib"\r
                                GenerateDebugInformation="true"\r
@@ -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"\r
                                StringPooling="true"\r
                                MinimalRebuild="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="true"\r
                                EnableEnhancedInstructionSet="0"\r
                                FloatingPointModel="2"\r