Modified Files:

FlightGear.sln FlightGear.vcproj FlightGearLib.vcproj Added Files: JS_demo.vcproj: Import changes from Olaf
2006-09-30 07:10:34 +00:00 · 2006-09-30 07:10:34 +00:00 · 8be61d7813
commit 8be61d7813
parent fee78e5119
4 changed files with 281 additions and 17 deletions
--- a/projects/VC8/FlightGear.sln
+++ b/projects/VC8/FlightGear.sln
@ -8,6 +8,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlightGear", "FlightGear.vc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlightGearLib", "FlightGearLib.vcproj", "{BA3B78EA-4D5D-43DB-8AD0-9B2FB57489C0}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JS_demo", "JS_demo.vcproj", "{7E64A670-D297-468D-AF5D-315A02AA668F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@ -22,6 +24,10 @@ Global
 		{BA3B78EA-4D5D-43DB-8AD0-9B2FB57489C0}.Debug|Win32.Build.0 = Debug|Win32
 		{BA3B78EA-4D5D-43DB-8AD0-9B2FB57489C0}.Release|Win32.ActiveCfg = Release|Win32
 		{BA3B78EA-4D5D-43DB-8AD0-9B2FB57489C0}.Release|Win32.Build.0 = Release|Win32
+		{7E64A670-D297-468D-AF5D-315A02AA668F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7E64A670-D297-468D-AF5D-315A02AA668F}.Debug|Win32.Build.0 = Debug|Win32
+		{7E64A670-D297-468D-AF5D-315A02AA668F}.Release|Win32.ActiveCfg = Release|Win32
+		{7E64A670-D297-468D-AF5D-315A02AA668F}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/projects/VC8/FlightGear.vcproj
+++ b/projects/VC8/FlightGear.vcproj
@ -38,7 +38,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				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"
+				AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../devel/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;NOMINMAX;FREEGLUT_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@ -59,9 +59,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
+				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"
 				LinkIncremental="2"
-				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"
+				AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../devel/lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				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"
+				AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../devel/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX;FREEGLUT_STATIC"
 				StringPooling="true"
 				RuntimeLibrary="0"
@ -137,7 +137,7 @@
 				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 ssg.lib ssgAux.lib ul.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;;../../../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"
+				AdditionalLibraryDirectories="&quot;FG$(IntDir)&quot;;../../../plib/;&quot;../../../Simgear/Projects/VC8/$(IntDir)&quot;;../../../devel/lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/projects/VC8/FlightGearLib.vcproj
+++ b/projects/VC8/FlightGearLib.vcproj
@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				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"
+				AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../devel/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX;FREEGLUT_STATIC"
 				StringPooling="true"
 				MinimalRebuild="true"
@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				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"
+				AdditionalIncludeDirectories="../../../;../../../Simgear;../../src;../../src/include;../../src/input;../../src/FDM/JSBSim;../../../devel/include"
 				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"
 				StringPooling="true"
 				MinimalRebuild="false"
@ -1812,7 +1812,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\aimodel\AIAircraft.cxx"
+				RelativePath="..\..\src\AIModel\AIAircraft.cxx"
 				>
 			</File>
 			<File
@ -1820,7 +1820,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\aimodel\AIBase.cxx"
+				RelativePath="..\..\src\AIModel\AIBase.cxx"
 				>
 			</File>
 			<File
@ -1836,7 +1836,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\aimodel\AIFlightPlanCreate.cxx"
+				RelativePath="..\..\src\AIModel\AIFlightPlanCreate.cxx"
 				>
 			</File>
 			<File
@ -1852,7 +1852,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\aimodel\AIManager.cxx"
+				RelativePath="..\..\src\AIModel\AIManager.cxx"
 				>
 			</File>
 			<File
@ -1975,6 +1975,10 @@
 				RelativePath="..\..\src\instrumentation\attitude_indicator.cxx"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\Network\AV400.cxx"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\Navaids\awynet.cxx"
 				>
@ -2507,10 +2511,6 @@
 				RelativePath="..\..\src\network\httpd.cxx"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\cockpit\hud.cxx"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\Instrumentation\HUD\HUD.cxx"
 				>
@ -2533,6 +2533,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\src\cockpit\hud.cxx"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\cockpit\hud_card.cxx"
 				>
@ -3060,7 +3064,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\traffic\Schedule.cxx"
+				RelativePath="..\..\src\Traffic\Schedule.cxx"
 				>
 			</File>
 			<File
@ -3136,7 +3140,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\traffic\TrafficMgr.cxx"
+				RelativePath="..\..\src\Traffic\TrafficMgr.cxx"
 				>
 			</File>
 			<File
--- a/projects/VC8/JS_demo.vcproj
+++ b/projects/VC8/JS_demo.vcproj
@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="JS_demo"
+	ProjectGUID="{7E64A670-D297-468D-AF5D-315A02AA668F}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="JSDebug"
+			IntermediateDirectory="JSDebug"
+			ConfigurationType="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../;../../src/include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;NOMINMAX;FREEGLUT_STATIC"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="js_d.lib ul_d.lib advapi32.lib comdlg32.lib shell32.lib user32.lib winmm.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../plib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+				FixedBaseAddress="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="JSRelease"
+			IntermediateDirectory="JSRelease"
+			ConfigurationType="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../../;../../src/include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_THREADS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CONST_CORRECT_OVERLOADS;_USE_MATH_DEFINES;NOMINMAX;FREEGLUT_STATIC"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="js.lib ul.lib advapi32.lib comdlg32.lib shell32.lib user32.lib winmm.lib"
+				LinkIncremental="0"
+				AdditionalLibraryDirectories="../../../plib/"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+				FixedBaseAddress="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\src\main\fg_commands.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\fg_init.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\fg_io.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\fg_os.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\fg_props.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\globals.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\main.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\options.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\renderer.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\splash.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\util.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\viewer.hxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\main\viewmgr.hxx"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\src\Input\js_demo.cxx"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>