Modified Files:

	FlightGear.sln FlightGear.vcproj FlightGearLib.vcproj
Added Files:
	JS_demo.vcproj: Import changes from Olaf

diff --git a/projects/VC8/FlightGear.sln b/projects/VC8/FlightGear.sln
index f26f08eb367997e4403d6de95e99045c82c57adb..04241661f9a7774abf1a61ff89728eab413fb6fd 100755 (executable)
--- a/projects/VC8/FlightGear.sln
+++ b/projects/VC8/FlightGear.sln
@@ -8,6 +8,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlightGear", "FlightGear.vc
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlightGearLib", "FlightGearLib.vcproj", "{BA3B78EA-4D5D-43DB-8AD0-9B2FB57489C0}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JS_demo", "JS_demo.vcproj", "{7E64A670-D297-468D-AF5D-315A02AA668F}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -22,6 +24,10 @@ Global
                {BA3B78EA-4D5D-43DB-8AD0-9B2FB57489C0}.Debug|Win32.Build.0 = Debug|Win32\r
                {BA3B78EA-4D5D-43DB-8AD0-9B2FB57489C0}.Release|Win32.ActiveCfg = Release|Win32\r
                {BA3B78EA-4D5D-43DB-8AD0-9B2FB57489C0}.Release|Win32.Build.0 = Release|Win32\r
+               {7E64A670-D297-468D-AF5D-315A02AA668F}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {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
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/projects/VC8/FlightGear.vcproj b/projects/VC8/FlightGear.vcproj
index 145ce3cdeae673a28001efe91b6f5d9995be88f2..e1e200fb76fc0b59769df8d069d4eae854dc86a8 100755 (executable)
--- a/projects/VC8/FlightGear.vcproj
+++ b/projects/VC8/FlightGear.vcproj
@@ -38,7 +38,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../../AL/include;../../../zlib-1.2.3;../../../freeglut-2.4.0/include;../../../Pre-built.2/include;../../src/include;../../src/input;../../src/FDM/JSBSim"\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
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -59,9 +59,9 @@
                        />\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 zlibd.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 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
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;&quot;../../../freeglut-2.4.0/$(IntDir)Static&quot;;&quot;../../../Pre-Built.2/lib&quot;;&quot;../../../zlib-1.2.3/projects/visualc6/win32_lib_asm_$(IntDir)&quot;;../../../al/lib"\r
+                               AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../devel/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
@@ -115,7 +115,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../../AL/include;../../../zlib-1.2.3;../../../freeglut-2.4.0/include;../../../Pre-built.2/include;../../src/include;../../src/input;../../src/FDM/JSBSim"\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
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
@@ -137,7 +137,7 @@
                                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
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;&quot;../../../freeglut-2.4.0/$(IntDir)Static&quot;;&quot;../../../Pre-Built.2/lib&quot;;&quot;../../../zlib-1.2.3/projects/visualc6/win32_lib_asm_$(IntDir)&quot;;../../../al/lib"\r
+                               AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../devel/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/projects/VC8/FlightGearLib.vcproj b/projects/VC8/FlightGearLib.vcproj
index bed36be5c4765373420b2504a74a9367e4102005..15b9d7159fc3179cc7b0a832eb7ff5c41ba3025d 100755 (executable)
--- a/projects/VC8/FlightGearLib.vcproj
+++ b/projects/VC8/FlightGearLib.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../../AL/include;../../../zlib-1.2.3;../../../freeglut-2.4.0/include;../../../Pre-built.2/include;../../src/include;../../src/input;../../src/FDM/JSBSim"\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
                                StringPooling="true"\r
                                MinimalRebuild="true"\r
@@ -104,7 +104,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../../AL/include;../../../zlib-1.2.3;../../../freeglut-2.4.0/include;../../../Pre-built.2/include;../../src/include;../../src/input;../../src/FDM/JSBSim"\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
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
@@ -1812,7 +1812,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\aimodel\AIAircraft.cxx"\r
+                               RelativePath="..\..\src\AIModel\AIAircraft.cxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1820,7 +1820,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\aimodel\AIBase.cxx"\r
+                               RelativePath="..\..\src\AIModel\AIBase.cxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1836,7 +1836,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\aimodel\AIFlightPlanCreate.cxx"\r
+                               RelativePath="..\..\src\AIModel\AIFlightPlanCreate.cxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1852,7 +1852,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\aimodel\AIManager.cxx"\r
+                               RelativePath="..\..\src\AIModel\AIManager.cxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1975,6 +1975,10 @@
                                RelativePath="..\..\src\instrumentation\attitude_indicator.cxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\Network\AV400.cxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\Navaids\awynet.cxx"\r
                                >\r
@@ -2507,10 +2511,6 @@
                                RelativePath="..\..\src\network\httpd.cxx"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\src\cockpit\hud.cxx"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\Instrumentation\HUD\HUD.cxx"\r
                                >\r
@@ -2533,6 +2533,10 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\cockpit\hud.cxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\cockpit\hud_card.cxx"\r
                                >\r
@@ -3060,7 +3064,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\traffic\Schedule.cxx"\r
+                               RelativePath="..\..\src\Traffic\Schedule.cxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -3136,7 +3140,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\traffic\TrafficMgr.cxx"\r
+                               RelativePath="..\..\src\Traffic\TrafficMgr.cxx"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/projects/VC8/JS_demo.vcproj b/projects/VC8/JS_demo.vcproj
new file mode 100644 (file)
index 0000000..139c4f5
--- /dev/null
+++ b/projects/VC8/JS_demo.vcproj
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8,00"\r
+       Name="JS_demo"\r
+       ProjectGUID="{7E64A670-D297-468D-AF5D-315A02AA668F}"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="JSDebug"\r
+                       IntermediateDirectory="JSDebug"\r
+                       ConfigurationType="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../../;../../src/include"\r
+                               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
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="js_d.lib ul_d.lib advapi32.lib comdlg32.lib shell32.lib user32.lib winmm.lib"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="../../../plib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                               FixedBaseAddress="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="JSRelease"\r
+                       IntermediateDirectory="JSRelease"\r
+                       ConfigurationType="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               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
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="js.lib ul.lib advapi32.lib comdlg32.lib shell32.lib user32.lib winmm.lib"\r
+                               LinkIncremental="0"\r
+                               AdditionalLibraryDirectories="../../../plib/"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                               FixedBaseAddress="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\main\fg_commands.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\fg_init.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\fg_io.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\fg_os.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\fg_props.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\globals.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\main.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\options.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\renderer.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\splash.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\util.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\viewer.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\main\viewmgr.hxx"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\Input\js_demo.cxx"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r