--- np2/win9x/np2x64.vcproj	2007/01/08 06:58:02	1.2
+++ np2/win9x/np2x64.vcproj	2007/12/29 11:12:50	1.7
@@ -13,11 +13,14 @@
 		/>
 	</Platforms>
 	<ToolFiles>
+		<ToolFile
+			RelativePath=".\x64\x64.rules"
+		/>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\bin\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin"
 			IntermediateDirectory="..\obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
@@ -29,6 +32,10 @@
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
+				Name="YASM"
+				IncludePaths=".\x64,..\i286c\x64,..\io\x64"
+			/>
+			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
@@ -40,20 +47,27 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\,.\dialog,.\debuguty,..\,..\common,..\codecnv,..\i286c,..\mem,..\io,..\cbus,..\bios,..\lio,..\vram,..\sound,..\sound\vermouth,..\sound\getsnd,..\fdd,..\font,..\generic,..\trap,..\zlib"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
 				WarningLevel="3"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4819"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_WIN64;_UNICODE;UNICODE"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<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)/np2x64d.exe"
+				GenerateDebugInformation="true"
+				GenerateMapFile="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -95,6 +109,10 @@
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
+				Name="YASM"
+				IncludePaths=".\x64,..\i286c\x64,..\io\x64"
+			/>
+			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
@@ -108,22 +126,25 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories=".\,.\dialog,.\debuguty,..\,..\common,..\codecnv,..\i286c,..\mem,..\io,..\cbus,..\bios,..\lio,..\vram,..\sound,..\sound\vermouth,..\sound\getsnd,..\fdd,..\font,..\generic,..\trap,..\zlib"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				BufferSecurityCheck="false"
 				WarningLevel="3"
+				DisableSpecificWarnings="4819"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_WIN64;_UNICODE;UNICODE"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<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"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -220,7 +241,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\common\PARTS.C"
+					RelativePath=".\x64\PARTS.X64"
 					>
 				</File>
 				<File
@@ -620,7 +641,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\vram\MAKEGRPH.C"
+					RelativePath=".\x64\MAKEGRPH.X64"
 					>
 				</File>
 				<File
@@ -867,6 +888,14 @@
 			<Filter
 				Name="trap"
 				>
+				<File
+					RelativePath="..\trap\INTTRAP.C"
+					>
+				</File>
+				<File
+					RelativePath="..\trap\STEPTRAP.C"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="win9x"
@@ -1161,7 +1190,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\np2x64.rc"
+				RelativePath=".\resources\1252\np2.rc"
 				>
 			</File>
 		</Filter>