--- np2/win9x/np21x64.vcproj	2006/12/30 16:43:13	1.1.2.1
+++ np2/win9x/np21x64.vcproj	2007/01/10 14:43:36	1.4
@@ -20,7 +20,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\bin\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin"
 			IntermediateDirectory="..\obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
@@ -47,8 +47,9 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\,.\dialog,.\debuguty,..\,..\common,..\codecnv,..\i386c,..\i386c\ia32,..\i386c\ia32\instructions,..\i386c\ia32\instructions\fpu,..\mem,..\io,..\cbus,..\bios,..\lio,..\vram,..\sound,..\sound\vermouth,..\sound\getsnd,..\fdd,..\font,..\generic,..\trap,..\zlib"
-				PreprocessorDefinitions="SUPPORT_PC9821"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE,SUPPORT_PC9821"
 				WarningLevel="3"
+				DisableSpecificWarnings="4819"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -61,7 +62,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ddraw.lib dxguid.lib dsound.lib winmm.lib comdlg32.lib comctl32.lib"
+				AdditionalDependencies="ddraw.lib dxguid.lib dsound.lib winmm.lib comdlg32.lib comctl32.lib wsock32.lib"
+				OutputFile="$(OutDir)/np21x64d.exe"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -122,10 +124,11 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories=".\,.\dialog,.\debuguty,..\,..\common,..\codecnv,..\i386c,..\i386c\ia32,..\i386c\ia32\instructions,..\i386c\ia32\instructions\fpu,..\mem,..\io,..\cbus,..\bios,..\lio,..\vram,..\sound,..\sound\vermouth,..\sound\getsnd,..\fdd,..\font,..\generic,..\trap,..\zlib"
-				PreprocessorDefinitions="SUPPORT_PC9821"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE,SUPPORT_PC9821"
 				StringPooling="true"
 				BufferSecurityCheck="false"
 				WarningLevel="3"
+				DisableSpecificWarnings="4819"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -138,7 +141,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ddraw.lib dxguid.lib dsound.lib winmm.lib comdlg32.lib comctl32.lib wsock32.lib "
+				AdditionalDependencies="ddraw.lib dxguid.lib dsound.lib winmm.lib comdlg32.lib comctl32.lib wsock32.lib"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
 			/>
@@ -237,24 +240,8 @@
 					>
 				</File>
 				<File
-					RelativePath="..\common\PARTS.C"
+					RelativePath=".\x64\PARTS.X64"
 					>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\common\PROFILE.C"
@@ -334,6 +321,14 @@
 					<File
 						RelativePath="..\i386c\ia32\disasm.c"
 						>
+						<FileConfiguration
+							Name="Release|x64"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
 					</File>
 					<File
 						RelativePath="..\i386c\ia32\exception.c"
@@ -741,24 +736,8 @@
 					>
 				</File>
 				<File
-					RelativePath="..\vram\MAKEGRPH.C"
+					RelativePath=".\x64\MAKEGRPH.X64"
 					>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\vram\MAKETEXT.C"
@@ -1008,6 +987,14 @@
 			<Filter
 				Name="trap"
 				>
+				<File
+					RelativePath="..\trap\INTTRAP.C"
+					>
+				</File>
+				<File
+					RelativePath="..\trap\STEPTRAP.C"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="zlib"
@@ -1288,39 +1275,6 @@
 						>
 					</File>
 				</Filter>
-				<Filter
-					Name="x64"
-					>
-					<File
-						RelativePath=".\x64\makegrph.x64"
-						>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="YASM"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="YASM"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\x64\parts.x64"
-						>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="YASM"
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
 			</Filter>
 		</Filter>
 		<Filter