--- ./build/win32/libx264.vcproj	2008-03-17 11:06:54.984125000 +0100
+++ ./build/win32/libx264.vcproj2	2008-03-17 10:31:04.031000000 +0100
@@ -605,34 +605,6 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\csp.c">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release64|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="..\..\common\dct.c">
 				<FileConfiguration
 					Name="Release|Win32">
@@ -735,7 +707,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\i386\mc-c.c">
+				RelativePath="..\..\common\x86\mc-c.c">
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
@@ -905,7 +877,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\i386\predict-c.c">
+				RelativePath="..\..\common\x86\predict-c.c">
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
@@ -963,9 +935,6 @@
 					RelativePath="..\..\common\cpu.h">
 				</File>
 				<File
-					RelativePath="..\..\common\csp.h">
-				</File>
-				<File
 					RelativePath="..\..\common\dct.h">
 				</File>
 				<File
@@ -991,16 +960,16 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="I386"
+				Name="x86"
 				Filter="*.h,*.c,*-a.asm">
 				<File
-					RelativePath="..\..\common\i386\cpu-a.asm">
+					RelativePath="..\..\common\x86\cpu-32.asm">
 					<FileConfiguration
 						Name="Release|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1009,7 +978,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1019,53 +988,84 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath="..\..\common\i386\dct-a.asm">
-					<FileConfiguration
+        <File
+					RelativePath="..\..\common\x86\dct-32.asm">
+          <FileConfiguration
 						Name="Release|Win32">
-						<Tool
+            <Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
-					</FileConfiguration>
-					<FileConfiguration
+          </FileConfiguration>
+          <FileConfiguration
 						Name="Debug|Win32">
-						<Tool
+            <Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
-					</FileConfiguration>
-					<FileConfiguration
+          </FileConfiguration>
+          <FileConfiguration
 						Name="Release64|Win32"
 						ExcludedFromBuild="TRUE">
-						<Tool
+            <Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\common\i386\dct.h">
+          </FileConfiguration>
+        </File>
+        <File
+					RelativePath="..\..\common\x86\dct-a.asm">
+          <FileConfiguration
+						Name="Release|Win32">
+            <Tool
+							Name="VCCustomBuildTool"
+							Description="Assembly $(InputPath)"
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+"
+							Outputs="$(IntDir)\$(InputName).obj"/>
+          </FileConfiguration>
+          <FileConfiguration
+						Name="Debug|Win32">
+            <Tool
+							Name="VCCustomBuildTool"
+							Description="Assembly $(InputPath)"
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+"
+							Outputs="$(IntDir)\$(InputName).obj"/>
+          </FileConfiguration>
+          <FileConfiguration
+						Name="Release64|Win32"
+						ExcludedFromBuild="TRUE">
+            <Tool
+							Name="VCCustomBuildTool"
+							Description="Assembly $(InputPath)"
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+"
+							Outputs="$(IntDir)\$(InputName).obj"/>
+          </FileConfiguration>
+        </File>
+        <File
+					RelativePath="..\..\common\x86\dct.h">
 				</File>
 				<File
-					RelativePath="..\..\common\i386\deblock-a.asm">
+					RelativePath="..\..\common\x86\deblock-a.asm">
 					<FileConfiguration
 						Name="Release|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1073,7 +1073,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1081,18 +1081,18 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\i386inc.asm">
+					RelativePath="..\..\common\x86\x86inc.asm">
 					<FileConfiguration
 						Name="Release|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1101,7 +1101,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1110,19 +1110,19 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\mc-a.asm">
+					RelativePath="..\..\common\x86\mc-a.asm">
 					<FileConfiguration
 						Name="Release|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1131,7 +1131,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1141,19 +1141,19 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\mc-a2.asm">
+					RelativePath="..\..\common\x86\mc-a2.asm">
 					<FileConfiguration
 						Name="Release|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1162,7 +1162,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1172,19 +1172,19 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\pixel-a.asm">
+					RelativePath="..\..\common\x86\pixel-a.asm">
 					<FileConfiguration
 						Name="Release|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1193,7 +1193,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1203,19 +1203,19 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\pixel-sse2.asm">
+					RelativePath="..\..\common\x86\pixel-32.asm">
 					<FileConfiguration
 						Name="Release|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1224,7 +1224,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1234,22 +1234,22 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\pixel.h">
+					RelativePath="..\..\common\x86\pixel.h">
 				</File>
 				<File
-					RelativePath="..\..\common\i386\predict-a.asm">
+					RelativePath="..\..\common\x86\predict-a.asm">
 					<FileConfiguration
 						Name="Release|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1258,7 +1258,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
@@ -1268,51 +1268,82 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath="..\..\common\i386\quant-a.asm">
-					<FileConfiguration
+        <File
+					RelativePath="..\..\common\x86\quant-a.asm">
+          <FileConfiguration
 						Name="Release|Win32">
-						<Tool
+            <Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
-					</FileConfiguration>
-					<FileConfiguration
+          </FileConfiguration>
+          <FileConfiguration
 						Name="Debug|Win32">
-						<Tool
+            <Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
-					</FileConfiguration>
-					<FileConfiguration
+          </FileConfiguration>
+          <FileConfiguration
 						Name="Release64|Win32"
 						ExcludedFromBuild="TRUE">
-						<Tool
+            <Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
 "
 							Outputs="$(IntDir)\$(InputName).obj"/>
-					</FileConfiguration>
-				</File>
-			</Filter>
+          </FileConfiguration>
+        </File>
+        <File
+					RelativePath="..\..\common\x86\sad-a.asm">
+          <FileConfiguration
+						Name="Release|Win32">
+            <Tool
+							Name="VCCustomBuildTool"
+							Description="Assembly $(InputPath)"
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+"
+							Outputs="$(IntDir)\$(InputName).obj"/>
+          </FileConfiguration>
+          <FileConfiguration
+						Name="Debug|Win32">
+            <Tool
+							Name="VCCustomBuildTool"
+							Description="Assembly $(InputPath)"
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+"
+							Outputs="$(IntDir)\$(InputName).obj"/>
+          </FileConfiguration>
+          <FileConfiguration
+						Name="Release64|Win32"
+						ExcludedFromBuild="TRUE">
+            <Tool
+							Name="VCCustomBuildTool"
+							Description="Assembly $(InputPath)"
+							CommandLine="nasm -I..\..\common\x86\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
+"
+							Outputs="$(IntDir)\$(InputName).obj"/>
+          </FileConfiguration>
+        </File>
+      </Filter>
 			<Filter
 				Name="AMD64"
 				Filter="">
 				<File
-					RelativePath="..\..\common\amd64\amd64inc.asm">
+					RelativePath="..\..\common\x86\amd64inc.asm">
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\cpu-a.asm">
+					RelativePath="..\..\common\x86\cpu-64.asm">
 					<FileConfiguration
 						Name="Release|Win32"
 						ExcludedFromBuild="TRUE">
@@ -1335,7 +1366,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\dct-a.asm">
+					RelativePath="..\..\common\x86\dct-64.asm">
 					<FileConfiguration
 						Name="Release|Win32"
 						ExcludedFromBuild="TRUE">
@@ -1358,7 +1389,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\mc-a.asm">
+					RelativePath="..\..\common\x86\mc-a.asm">
 					<FileConfiguration
 						Name="Release|Win32"
 						ExcludedFromBuild="TRUE">
@@ -1381,7 +1412,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\mc-a2.asm">
+					RelativePath="..\..\common\x86\mc-a2.asm">
 					<FileConfiguration
 						Name="Release|Win32"
 						ExcludedFromBuild="TRUE">
@@ -1404,7 +1435,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\pixel-a.asm">
+					RelativePath="..\..\common\x86\pixel-a.asm">
 					<FileConfiguration
 						Name="Release|Win32"
 						ExcludedFromBuild="TRUE">
@@ -1427,7 +1458,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\predict-a.asm">
+					RelativePath="..\..\common\x86\predict-a.asm">
 					<FileConfiguration
 						Name="Release|Win32"
 						ExcludedFromBuild="TRUE">
@@ -1450,7 +1481,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\quant-a.asm">
+					RelativePath="..\..\common\x86\quant-a.asm">
 					<FileConfiguration
 						Name="Release|Win32"
 						ExcludedFromBuild="TRUE">