Merge remote-tracking branch 'origin/master' into Extra-VAXen

Merged related functionality into new VAX 750 modules Cleaned up compiler complaints from the clang compiler
2026-01-26 04:02:39 +00:00 · 2012-10-22 06:32:38 -07:00
parent f8e34b103b be1e1326b3
commit 9cd3a07ff6
352 changed files with 48645 additions and 23355 deletions
--- a/Projects/0ReadMe_Projects.txt
+++ b/Projects/0ReadMe_Projects.txt
@@ -21,7 +21,7 @@ For Example, the directory structure should look like:

 The contents of the windows-build directory can be downloaded from:

-    https://github.com/downloads/markpizz/simh/windows-build.zip
+    https://github.com/downloads/simh/simh/windows-build.zip


 Network devices are capable of using pthreads to enhance their performance.  
--- a/Projects/AltairZ80.vcproj
+++ b/Projects/AltairZ80.vcproj
@@ -237,10 +237,6 @@
 				RelativePath="..\AltairZ80\i86_prim_ops.c"
 				>
 			</File>
-			<File
-				RelativePath="..\AltairZ80\insnsa.c"
-				>
-			</File>
 			<File
 				RelativePath="..\AltairZ80\insnsd.c"
 				>
--- a/Projects/HP2100.vcproj
+++ b/Projects/HP2100.vcproj
@@ -225,6 +225,14 @@
 				RelativePath="..\HP2100\hp2100_cpu7.c"
 				>
 			</File>
+			<File
+				RelativePath="..\HP2100\hp2100_di.c"
+				>
+			</File>
+			<File
+				RelativePath="..\HP2100\hp2100_di_da.c"
+				>
+			</File>
 			<File
 				RelativePath="..\HP2100\hp2100_dp.c"
 				>
@@ -289,6 +297,10 @@
 				RelativePath="..\HP2100\hp2100_sys.c"
 				>
 			</File>
+			<File
+				RelativePath="..\HP2100\hp_disclib.c"
+				>
+			</File>
 			<File
 				RelativePath="..\scp.c"
 				>
@@ -338,6 +350,10 @@
 				RelativePath="hp2100_defs.h"
 				>
 			</File>
+			<File
+				RelativePath="..\HP2100\hp2100_di.h"
+				>
+			</File>
 			<File
 				RelativePath="..\HP2100\hp2100_fp.h"
 				>
@@ -346,6 +362,10 @@
 				RelativePath="..\HP2100\hp2100_fp1.h"
 				>
 			</File>
+			<File
+				RelativePath="..\HP2100\hp_disclib.h"
+				>
+			</File>
 			<File
 				RelativePath="..\scp.h"
 				>
--- a/Projects/PDP11.vcproj
+++ b/Projects/PDP11.vcproj
@@ -396,10 +396,6 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
-			<File
-				RelativePath="..\dec_dz.h"
-				>
-			</File>
 			<File
 				RelativePath="..\PDP11\pdp11_cpumod.h"
 				>
--- a/Projects/Simh.sln
+++ b/Projects/Simh.sln
@@ -43,8 +43,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "I1620", "I1620.vcproj", "{0
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IBM1130", "IBM1130.vcproj", "{D593C954-5115-4D15-ABDB-01B66006FF6F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDP18B", "PDP18B.vcproj", "{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDP15", "PDP15.vcproj", "{44C07AA4-6D56-45ED-8393-18A23E76B758}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDP9", "PDP9.vcproj", "{9D589BCA-9E10-4FFA-B43F-DDFA91C1C098}"
@@ -61,7 +59,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lgp", "lgp.vcproj", "{927C3
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "I7094", "I7094.vcproj", "{927C3BD9-BD0C-4A23-99F9-DEAD402BEEF9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SWTP", "SWTP.vcproj", "{0ABAF350-853E-4A8F-8435-B583E29FB78C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swtp6800mp-a", "swtp6800mp-a.vcproj", "{0ABAF350-853E-4A8F-8435-B583E29FB78C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swtp6800mp-a2", "swtp6800mp-a2.vcproj", "{A0BAF350-853E-4A8F-8435-B583E29FFACE}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildROMs", "BuildROMs.vcproj", "{D40F3AF1-EEE7-4432-9807-2AD287B490F8}"
 EndProject
@@ -153,10 +153,6 @@ Global
 		{D593C954-5115-4D15-ABDB-01B66006FF6F}.Debug|Win32.Build.0 = Debug|Win32
 		{D593C954-5115-4D15-ABDB-01B66006FF6F}.Release|Win32.ActiveCfg = Release|Win32
 		{D593C954-5115-4D15-ABDB-01B66006FF6F}.Release|Win32.Build.0 = Release|Win32
-		{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}.Debug|Win32.Build.0 = Debug|Win32
-		{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}.Release|Win32.ActiveCfg = Release|Win32
-		{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}.Release|Win32.Build.0 = Release|Win32
 		{44C07AA4-6D56-45ED-8393-18A23E76B758}.Debug|Win32.ActiveCfg = Debug|Win32
 		{44C07AA4-6D56-45ED-8393-18A23E76B758}.Debug|Win32.Build.0 = Debug|Win32
 		{44C07AA4-6D56-45ED-8393-18A23E76B758}.Release|Win32.ActiveCfg = Release|Win32
@@ -193,6 +189,10 @@ Global
 		{0ABAF350-853E-4A8F-8435-B583E29FB78C}.Debug|Win32.Build.0 = Debug|Win32
 		{0ABAF350-853E-4A8F-8435-B583E29FB78C}.Release|Win32.ActiveCfg = Release|Win32
 		{0ABAF350-853E-4A8F-8435-B583E29FB78C}.Release|Win32.Build.0 = Release|Win32
+		{A0BAF350-853E-4A8F-8435-B583E29FFACE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A0BAF350-853E-4A8F-8435-B583E29FFACE}.Debug|Win32.Build.0 = Debug|Win32
+		{A0BAF350-853E-4A8F-8435-B583E29FFACE}.Release|Win32.ActiveCfg = Release|Win32
+		{A0BAF350-853E-4A8F-8435-B583E29FFACE}.Release|Win32.Build.0 = Release|Win32
 		{D40F3AF1-EEE7-4432-9807-2AD287B490F8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D40F3AF1-EEE7-4432-9807-2AD287B490F8}.Debug|Win32.Build.0 = Debug|Win32
 		{D40F3AF1-EEE7-4432-9807-2AD287B490F8}.Release|Win32.ActiveCfg = Release|Win32
--- a/Projects/VAX.vcproj
+++ b/Projects/VAX.vcproj
@@ -134,11 +134,13 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/pthreads&quot;"
 				PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO"
 				KeepComments="false"
 				StringPooling="true"
 				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -166,6 +168,7 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -260,6 +263,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						WholeProgramOptimization="false"
 						PreprocessorDefinitions="HAVE_PTW32_CONFIG_H;PTW32_BUILD_INLINED;PTW32_STATIC_LIB;__CLEANUP_C;$(NOINHERIT)"
 					/>
 				</FileConfiguration>
@@ -357,10 +361,6 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
-			<File
-				RelativePath="..\PDP11\dec_dz.h"
-				>
-			</File>
 			<File
 				RelativePath="..\PDP11\pdp11_io_lib.h"
 				>
--- a/Projects/VAX780.vcproj
+++ b/Projects/VAX780.vcproj
@@ -133,10 +133,12 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/pthreads&quot;"
 				PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_780;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO"
 				StringPooling="true"
 				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -164,6 +166,7 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -250,6 +253,10 @@
 				RelativePath="..\PDP11\pdp11_tu.c"
 				>
 			</File>
+			<File
+				RelativePath="..\PDP11\pdp11_vh.c"
+				>
+			</File>
 			<File
 				RelativePath="..\PDP11\pdp11_xu.c"
 				>
@@ -270,6 +277,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						WholeProgramOptimization="false"
 						PreprocessorDefinitions="HAVE_PTW32_CONFIG_H;PTW32_BUILD_INLINED;PTW32_STATIC_LIB;__CLEANUP_C;$(NOINHERIT)"
 					/>
 				</FileConfiguration>
@@ -379,10 +387,6 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
-			<File
-				RelativePath="..\dec_dz.h"
-				>
-			</File>
 			<File
 				RelativePath="..\PDP11\pdp11_io_lib.h"
 				>
--- a/Projects/swtp6800mp-a.vcproj
+++ b/Projects/swtp6800mp-a.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="SWTP"
+	Name="swtp6800mp-a"
 	ProjectGUID="{0ABAF350-853E-4A8F-8435-B583E29FB78C}"
-	RootNamespace="SWTP"
+	RootNamespace="swtp6800mp-a"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@@ -19,7 +19,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
-			IntermediateDirectory="..\BIN\NT\Project\simh\SWTP\$(PlatformName)-$(ConfigurationName)"
+			IntermediateDirectory="..\BIN\NT\Project\simh\swtp6800mp-a\$(PlatformName)-$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="0"
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="./;../"
+				AdditionalIncludeDirectories="./;../;../swtp6800/swtp6800"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -64,10 +64,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\SWTP.exe"
+				OutputFile="$(OutDir)\swtp6800mp-a.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\SWTP.pdb"
+				ProgramDatabaseFile="$(OutDir)\swtp6800mp-a.pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -98,7 +98,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
-			IntermediateDirectory="..\BIN\NT\Project\simh\SWTP\$(PlatformName)-$(ConfigurationName)"
+			IntermediateDirectory="..\BIN\NT\Project\simh\swtp6800mp-a\$(PlatformName)-$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="0"
@@ -123,7 +123,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="./;../"
+				AdditionalIncludeDirectories="./;../;../swtp6800/swtp6800"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -145,7 +145,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\SWTP.exe"
+				OutputFile="$(OutDir)\swtp6800mp-a.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -185,6 +185,42 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
+			<File
+				RelativePath="..\swtp6800\common\bootrom.c"
+				>
+			</File>
+			<File
+				RelativePath="..\swtp6800\common\dc-4.c"
+				>
+			</File>
+			<File
+				RelativePath="..\swtp6800\common\m6800.c"
+				>
+			</File>
+			<File
+				RelativePath="..\swtp6800\common\m6810.c"
+				>
+			</File>
+			<File
+				RelativePath="..\swtp6800\common\mp-8m.c"
+				>
+			</File>
+			<File
+				RelativePath="..\swtp6800\common\mp-a.c"
+				>
+			</File>
+			<File
+				RelativePath="..\swtp6800\swtp6800\mp-a_sys.c"
+				>
+			</File>
+			<File
+				RelativePath="..\swtp6800\common\mp-b2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\swtp6800\common\mp-s.c"
+				>
+			</File>
 			<File
 				RelativePath="..\scp.c"
 				>
@@ -217,22 +253,6 @@
 				RelativePath="..\sim_tmxr.c"
 				>
 			</File>
-			<File
-				RelativePath="..\swtp\swtp_cpu.c"
-				>
-			</File>
-			<File
-				RelativePath="..\swtp\swtp_dsk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\swtp\swtp_sio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\swtp\swtp_sys.c"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -279,7 +299,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\swtp\swtp_defs.h"
+				RelativePath="..\swtp6800\swtp6800\swtp_defs.h"
 				>
 			</File>
 		</Filter>
--- a/Projects/swtp6800mp-a2.vcproj
+++ b/Projects/swtp6800mp-a2.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="PDP18B"
-	ProjectGUID="{0A3FD54C-E497-4B2D-AD32-D83EAF996D59}"
-	RootNamespace="PDP18B"
+	Name="swtp6800mp-a2"
+	ProjectGUID="{A0BAF350-853E-4A8F-8435-B583E29FFACE}"
+	RootNamespace="swtp6800mp-a2"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@@ -19,7 +19,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
-			IntermediateDirectory="..\BIN\NT\Project\simh\PDP18B\$(PlatformName)-$(ConfigurationName)"
+			IntermediateDirectory="..\BIN\NT\Project\simh\swtp6800mp-a2\$(PlatformName)-$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="0"
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../;../PDP18B/"
+				AdditionalIncludeDirectories="./;../;../swtp6800/swtp6800"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -64,10 +64,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\PDP18B.exe"
+				OutputFile="$(OutDir)\swtp6800mp-a2.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\PDP18B.pdb"
+				ProgramDatabaseFile="$(OutDir)\swtp6800mp-a2.pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -98,7 +98,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
-			IntermediateDirectory="..\BIN\NT\Project\simh\PDP18B\$(PlatformName)-$(ConfigurationName)"
+			IntermediateDirectory="..\BIN\NT\Project\simh\swtp6800mp-a2\$(PlatformName)-$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="0"
@@ -123,7 +123,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../;../PDP18B/"
+				AdditionalIncludeDirectories="./;../;../swtp6800/swtp6800"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -145,7 +145,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\PDP18B.exe"
+				OutputFile="$(OutDir)\swtp6800mp-a2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -186,51 +186,43 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath="..\PDP18B\pdp18b_cpu.c"
+				RelativePath="..\swtp6800\common\bootrom.c"
 				>
 			</File>
 			<File
-				RelativePath="..\PDP18B\pdp18b_drm.c"
+				RelativePath="..\swtp6800\common\dc-4.c"
 				>
 			</File>
 			<File
-				RelativePath="..\PDP18B\pdp18b_dt.c"
+				RelativePath="..\swtp6800\common\i2716.c"
 				>
 			</File>
 			<File
-				RelativePath="..\PDP18B\pdp18b_fpp.c"
+				RelativePath="..\swtp6800\common\m6800.c"
 				>
 			</File>
 			<File
-				RelativePath="..\PDP18B\pdp18b_lp.c"
+				RelativePath="..\swtp6800\common\m6810.c"
 				>
 			</File>
 			<File
-				RelativePath="..\PDP18B\pdp18b_mt.c"
+				RelativePath="..\swtp6800\common\mp-8m.c"
 				>
 			</File>
 			<File
-				RelativePath="..\PDP18B\pdp18b_rb.c"
+				RelativePath="..\swtp6800\common\mp-a2.c"
 				>
 			</File>
 			<File
-				RelativePath="..\PDP18B\pdp18b_rf.c"
+				RelativePath="..\swtp6800\swtp6800\mp-a2_sys.c"
 				>
 			</File>
 			<File
-				RelativePath="..\PDP18B\pdp18b_rp.c"
+				RelativePath="..\swtp6800\common\mp-b2.c"
 				>
 			</File>
 			<File
-				RelativePath="..\PDP18B\pdp18b_stddev.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_sys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\PDP18B\pdp18b_tt1.c"
+				RelativePath="..\swtp6800\common\mp-s.c"
 				>
 			</File>
 			<File
@@ -270,10 +262,6 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
-			<File
-				RelativePath="..\PDP18B\pdp18b_defs.h"
-				>
-			</File>
 			<File
 				RelativePath="..\scp.h"
 				>
@@ -314,6 +302,10 @@
 				RelativePath="..\sim_tmxr.h"
 				>
 			</File>
+			<File
+				RelativePath="..\swtp6800\swtp6800\swtp_defs.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"