Modified Files:

	projects/VC8/FlightGear.sln projects/VC8/FlightGear.vcproj
	projects/VC8/FlightGearLib.vcproj projects/VC8/JS_demo.vcproj:
	Import Olafs project files

diff --git a/projects/VC8/FlightGear.sln b/projects/VC8/FlightGear.sln
index 04241661f9a7774abf1a61ff89728eab413fb6fd..1fa2333ecac9f20449ca7acb0df6460b47b66fb1 100755 (executable)
--- a/projects/VC8/FlightGear.sln
+++ b/projects/VC8/FlightGear.sln
@@ -1,8 +1,9 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 9.00\r
-# Visual C++ Express 2005\r
+# Visual Studio 2005\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlightGear", "FlightGear.vcproj", "{0E698D36-EA1C-434F-A524-21A673C19F2E}"\r
        ProjectSection(ProjectDependencies) = postProject\r
+               {952B5B5B-7FC8-4AE9-A664-333322BEEEB0} = {952B5B5B-7FC8-4AE9-A664-333322BEEEB0}\r
                {BA3B78EA-4D5D-43DB-8AD0-9B2FB57489C0} = {BA3B78EA-4D5D-43DB-8AD0-9B2FB57489C0}\r
        EndProjectSection\r
 EndProject\r
@@ -10,6 +11,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlightGearLib", "FlightGear
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JS_demo", "JS_demo.vcproj", "{7E64A670-D297-468D-AF5D-315A02AA668F}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimGear", "..\..\..\SimGear\projects\VC8\SimGear.vcproj", "{952B5B5B-7FC8-4AE9-A664-333322BEEEB0}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -28,6 +31,10 @@ Global
                {7E64A670-D297-468D-AF5D-315A02AA668F}.Debug|Win32.Build.0 = Debug|Win32\r
                {7E64A670-D297-468D-AF5D-315A02AA668F}.Release|Win32.ActiveCfg = Release|Win32\r
                {7E64A670-D297-468D-AF5D-315A02AA668F}.Release|Win32.Build.0 = Release|Win32\r
+               {952B5B5B-7FC8-4AE9-A664-333322BEEEB0}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {952B5B5B-7FC8-4AE9-A664-333322BEEEB0}.Debug|Win32.Build.0 = Debug|Win32\r
+               {952B5B5B-7FC8-4AE9-A664-333322BEEEB0}.Release|Win32.ActiveCfg = Release|Win32\r
+               {952B5B5B-7FC8-4AE9-A664-333322BEEEB0}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/projects/VC8/FlightGear.vcproj b/projects/VC8/FlightGear.vcproj
index e1e200fb76fc0b59769df8d069d4eae854dc86a8..824dfaa84a1bbe0651428d3ea5b5da48c24cece0 100755 (executable)
--- a/projects/VC8/FlightGear.vcproj
+++ b/projects/VC8/FlightGear.vcproj
@@ -4,6 +4,7 @@
        Version="8,00"\r
        Name="FlightGear"\r
        ProjectGUID="{0E698D36-EA1C-434F-A524-21A673C19F2E}"\r
+       RootNamespace="FlightGear"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -38,11 +39,11 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../devel/include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;NOMINMAX;FREEGLUT_STATIC"\r
+                               AdditionalIncludeDirectories="../../../;../../../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
@@ -59,9 +60,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="FlightgearLib.lib Simgear.lib fnt_d.lib js_d.lib net_d.lib psl_d.lib puAux_d.lib pui_d.lib pw_d.lib sg_d.lib sl_d.lib ssg_d.lib ssgAux_d.lib ul_d.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_d.lib js_d.lib net_d.lib psl_d.lib puAux_d.lib pui_d.lib pw_d.lib sg_d.lib sl_d.lib ul_d.lib osgd.lib osgDBd.lib osgUtild.lib OpenThreadsWin32d.lib pthreadvc2.lib Alut.lib openal32.lib zlib1d.lib wsock32.lib advapi32.lib comdlg32.lib shell32.lib user32.lib"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../devel/lib"\r
+                               AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib"\r
+                               IgnoreDefaultLibraryNames="libcmt.lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
@@ -115,10 +117,10 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../devel/include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX;FREEGLUT_STATIC"\r
+                               AdditionalIncludeDirectories="../../../;../../../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
@@ -135,11 +137,11 @@
                        />\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 ssg.lib ssgAux.lib ul.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 ssgAux.lib ul.lib osg.lib osgDB.lib osgUtil.lib OpenThreadsWin32.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;;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../devel/lib"\r
+                               AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../3rdParty/lib"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
+                               SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r

diff --git a/projects/VC8/FlightGearLib.vcproj b/projects/VC8/FlightGearLib.vcproj
index a76e8ff833582c935b5e35d8acbd886dcf6f0ab0..1698921cc4c682ff7fee8e951f3b8d75ca2117cb 100755 (executable)
--- a/projects/VC8/FlightGearLib.vcproj
+++ b/projects/VC8/FlightGearLib.vcproj
@@ -4,6 +4,7 @@
        Version="8,00"\r
        Name="FlightGearLib"\r
        ProjectGUID="{BA3B78EA-4D5D-43DB-8AD0-9B2FB57489C0}"\r
+       RootNamespace="FlightGearLib"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -40,12 +41,12 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../devel/include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX;FREEGLUT_STATIC"\r
+                               AdditionalIncludeDirectories="../../../;../../../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
@@ -104,11 +105,11 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../devel/include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PTW32_STATIC_LIB;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX;FREEGLUT_STATIC"\r
+                               AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../3rdparty/include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PTW32_STATIC_LIB;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
@@ -2499,10 +2500,6 @@
                                RelativePath="..\..\src\Instrumentation\heading_indicator_fg.cxx"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\src\scenery\hitlist.cxx"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\fdm\yasim\Hook.cpp"\r
                                >\r
@@ -2859,6 +2856,10 @@
                                RelativePath="..\..\src\gui\mouse.cxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\Instrumentation\mrg.cxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\network\multiplay.cxx"\r
                                >\r

diff --git a/projects/VC8/JS_demo.vcproj b/projects/VC8/JS_demo.vcproj
index 139c4f548a8ad01b77418141f6266c8871d7e6ea..eb05251f5401bfe680d19e4153a8e22197495867 100644 (file)
--- a/projects/VC8/JS_demo.vcproj
+++ b/projects/VC8/JS_demo.vcproj
@@ -4,6 +4,7 @@
        Version="8,00"\r
        Name="JS_demo"\r
        ProjectGUID="{7E64A670-D297-468D-AF5D-315A02AA668F}"\r
+       RootNamespace="JS_demo"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -42,7 +43,7 @@
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;NOMINMAX;FREEGLUT_STATIC"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -118,7 +119,7 @@
                                AdditionalIncludeDirectories="../../../;../../src/include"\r
                                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
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r