winport:

- fix ICC project compiling;
2009-09-07 09:44:37 +00:00 · 2009-09-07 09:44:37 +00:00 · 6828c1f746
parent 407fa8f157
commit 6828c1f746
4 changed files with 1620 additions and 979 deletions
--- a/desmume/src/matrix.h
+++ b/desmume/src/matrix.h
@ -125,9 +125,15 @@ FORCEINLINE void memset_u16_le(void* dst, u16 val)
 	T1WriteWord((u8*)&u32val,0,val);
 	T1WriteWord((u8*)&u32val,2,val);
 	////const __m128i temp = _mm_set_epi32(u32val,u32val,u32val,u32val);
+	
+#ifdef __INTEL_COMPILER
+	const __m128i temp = _mm_set_epi32(u32val,u32val,u32val,u32val);
+	MACRODO_N(NUM/8,_mm_store_si128((__m128i*)((u8*)dst+(X)*16), temp));
+#else
 	__m128 temp; temp.m128_i32[0] = u32val;
 	//MACRODO_N(NUM/8,_mm_store_si128((__m128i*)((u8*)dst+(X)*16), temp));
 	MACRODO_N(NUM/8,_mm_store_ps1((float*)((u8*)dst+(X)*16), temp));
+#endif
 }

 #else //no sse2
--- a/desmume/src/windows/DeSmuME_Intel.icproj
+++ b/desmume/src/windows/DeSmuME_Intel.icproj
@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="shift_jis"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject 
 	ProjectType="Intel C++ Project"
 	Version="10.1"
 	Name="DeSmuME_Intel"
-	ProjectGUID="{439F53E2-431F-4F28-9058-C6A9B00B503F}"
+	ProjectGUID="{61FB2DAF-A8E9-4CCC-ADF4-B824B4F00187}"
 	VCNestedProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
-	VCNestedProjectCRC32="2872662123"
+	VCNestedProjectCRC32="2016830128"
 	VCNestedProjectFileName="DeSmuME_Intel.vcproj">
 	<Platforms>
 		<Platform 
 			Name="Win32"/>
+		<Platform 
+			Name="x64"/>
 	</Platforms>
 	<Configurations>
 		<Configuration 
@ -28,10 +30,11 @@
 				EnableIntrinsicFunctions="0"
 				FavorSizeOrSpeed="0"
 				EnableFiberSafeOptimizations="0"
-				AdditionalIncludeDirectories=".;..;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
-				PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI;HAVE_LIBZ;HAVE_LIBZZIP"
 				ExceptionHandling="1"
-				BufferSecurityCheck="0"
+				BasicRuntimeChecks="3"
+				BufferSecurityCheck="1"
 				EnableEnhancedInstructionSet="2"
 				DebugInformationFormat="4"
 				CallingConvention="0"
@ -39,8 +42,8 @@
 			<Tool 
 				Name="LinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib;glib-2.20.1\lib"
-				AdditionalDependencies="glib-2.20.1-x86.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib zlib-2008-x32.lib zziplib-2008-x32.lib"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib;glib-2.20.1\lib;lua\lib;.\7z;agg"
+				AdditionalDependencies="agg-2.5.lib lua-5.1.4-x86d.lib glib-2.20.1-x86.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2005-x32.lib zziplib-2005-x32.lib shlwapi.lib  winpcap\wpcap.lib 7zip.lib comctl32.lib"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="1"
 				GenerateMapFile="1"
@ -56,7 +59,68 @@
 			<Tool 
 				Name="BscMakeTool"/>
 			<Tool 
-				Name="PreBuildEventTool"/>
+				Name="PreBuildEventTool"
+				CommandLine="defaultconfig\SubWCRev.bat"/>
+			<Tool 
+				Name="PreLinkEventTool"/>
+			<Tool 
+				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
+			<Tool 
+				Name="MASM"/>
+		</Configuration>
+		<Configuration 
+			Name="Debug|x64">
+			<Tool 
+				Name="GeneralTool"
+				OutputDirectory="$(SolutionDir)\__bins"
+				IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
+				ConfigurationType="1"
+				InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"/>
+			<Tool 
+				Name="CppCmplrTool"
+				WholeProgramOptimization="0"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="0"
+				FavorSizeOrSpeed="0"
+				EnableFiberSafeOptimizations="0"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI;HAVE_LIBZ;HAVE_LIBZZIP"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				BufferSecurityCheck="1"
+				EnableEnhancedInstructionSet="0"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"/>
+			<Tool 
+				Name="LinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)_x64_debug.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib;glib-2.20.1\lib;lua\lib;.\7z;agg"
+				AdditionalDependencies="agg-2.5-x64.lib lua-5.1.4-x64.lib glib-2.20.1-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\x64\dxguid.lib shell32.lib comdlg32.lib directx\x64\dxerr8.lib directx\x64\dsound.lib directx\x64\dinput8.lib directx\x64\ddraw.lib zlib-2005-x64.lib zziplib-2005-x64.lib shlwapi.lib winpcap\x64\wpcap.lib 7zip-x64.lib"
+				DelayLoadDLLs="wpcap.dll"
+				GenerateDebugInformation="1"
+				GenerateMapFile="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+				DelayImpLib="DelayImp.lib"/>
+			<Tool 
+				Name="LibrarianTool"/>
+			<Tool 
+				Name="ResCmplrTool"/>
+			<Tool 
+				Name="MidlCmplrTool"
+				TargetEnvironment="3"/>
+			<Tool 
+				Name="BscMakeTool"/>
+			<Tool 
+				Name="PreBuildEventTool"
+				CommandLine="defaultconfig\SubWCRev.bat"/>
 			<Tool 
 				Name="PreLinkEventTool"/>
 			<Tool 
@ -81,15 +145,13 @@
 				Name="CppCmplrTool"
 				WholeProgramOptimization="1"
 				Optimization="1000"
-				GlobalOptimizations="1"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="1"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="1"
 				EnableFiberSafeOptimizations="1"
-				OptimizeForWindowsApplication="1"
-				AdditionalIncludeDirectories=".;..;&quot;.\glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG"
 				StringPooling="1"
 				ExceptionHandling="1"
 				StructMemberAlignment="0"
@ -97,17 +159,148 @@
 				EnableEnhancedInstructionSet="2"
 				WarningLevel="1"
 				DebugInformationFormat="3"
-				CallingConvention="1"
+				CallingConvention="0"
 				CompileAs="0"
 				UseProcExt="5"
 				Parallelization="1"/>
 			<Tool 
 				Name="LinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib;glib-2.20.1\lib"
-				AdditionalDependencies="glib-2.20.1-x86.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib zlib-2008-x32.lib zziplib-2008-x32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_release.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib;glib-2.20.1\lib;lua\lib;.\7z;agg"
+				AdditionalDependencies="agg-2.5.lib lua-5.1.4-x86.lib glib-2.20.1-x86.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2005-x32.lib zziplib-2005-x32.lib shlwapi.lib  winpcap\wpcap.lib 7zip.lib comctl32.lib"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="1"
+				OptimizeReferences="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+				Profile="0"
+				DelayImpLib="DelayImp.lib"/>
+			<Tool 
+				Name="LibrarianTool"/>
+			<Tool 
+				Name="ResCmplrTool"/>
+			<Tool 
+				Name="MidlCmplrTool"/>
+			<Tool 
+				Name="BscMakeTool"/>
+			<Tool 
+				Name="PreBuildEventTool"
+				CommandLine="defaultconfig\SubWCRev.bat"/>
+			<Tool 
+				Name="PreLinkEventTool"/>
+			<Tool 
+				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
+			<Tool 
+				Name="MASM"/>
+		</Configuration>
+		<Configuration 
+			Name="Release|x64">
+			<Tool 
+				Name="GeneralTool"
+				OutputDirectory="$(SolutionDir)\__bins"
+				IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
+				ConfigurationType="1"
+				WholeProgramOptimization="1"
+				InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"/>
+			<Tool 
+				Name="CppCmplrTool"
+				WholeProgramOptimization="1"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="1"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="1"
+				EnableFiberSafeOptimizations="1"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG"
+				StringPooling="1"
+				ExceptionHandling="1"
+				StructMemberAlignment="0"
+				BufferSecurityCheck="0"
+				WarningLevel="1"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+				UseProcExt="5"
+				Parallelization="1"/>
+			<Tool 
+				Name="LinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)_x64_release.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib;glib-2.20.1\lib;lua\lib;.\7z;agg"
+				AdditionalDependencies="agg-2.5-x64.lib lua-5.1.4-x64.lib glib-2.20.1-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\x64\dxguid.lib shell32.lib comdlg32.lib directx\x64\dxerr8.lib directx\x64\dsound.lib directx\x64\dinput8.lib directx\x64\ddraw.lib zlib-2005-x64.lib zziplib-2005-x64.lib shlwapi.lib winpcap\x64\wpcap.lib 7zip-x64.lib"
+				DelayLoadDLLs="wpcap.dll"
+				GenerateDebugInformation="1"
+				OptimizeReferences="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+				Profile="0"
+				DelayImpLib="DelayImp.lib"/>
+			<Tool 
+				Name="LibrarianTool"/>
+			<Tool 
+				Name="ResCmplrTool"/>
+			<Tool 
+				Name="MidlCmplrTool"
+				TargetEnvironment="3"/>
+			<Tool 
+				Name="BscMakeTool"/>
+			<Tool 
+				Name="PreBuildEventTool"
+				CommandLine="defaultconfig\SubWCRev.bat"/>
+			<Tool 
+				Name="PreLinkEventTool"/>
+			<Tool 
+				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
+			<Tool 
+				Name="MASM"/>
+		</Configuration>
+		<Configuration 
+			Name="Release FastBuild|Win32">
+			<Tool 
+				Name="GeneralTool"
+				OutputDirectory="$(SolutionDir)\__bins"
+				IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
+				ConfigurationType="1"
+				WholeProgramOptimization="0"
+				InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"/>
+			<Tool 
+				Name="CppCmplrTool"
+				WholeProgramOptimization="0"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="1"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="1"
+				EnableFiberSafeOptimizations="1"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG"
+				StringPooling="1"
+				ExceptionHandling="1"
+				StructMemberAlignment="0"
+				BufferSecurityCheck="0"
+				EnableEnhancedInstructionSet="2"
+				WarningLevel="1"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"/>
+			<Tool 
+				Name="LinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)_releaseFastBuild.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib;&quot;glib-2.20.1\lib&quot;;lua\lib;.\7z;.\agg"
+				AdditionalDependencies="agg-2.5.lib lua-5.1.4-x86.lib glib-2.20.1-x86.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2005-x32.lib zziplib-2005-x32.lib shlwapi.lib  winpcap\wpcap.lib 7zip.lib comctl32.lib"
+				DelayLoadDLLs="wpcap.dll"
+				GenerateDebugInformation="1"
+				OptimizeReferences="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				Profile="0"
@ -121,7 +314,73 @@
 			<Tool 
 				Name="BscMakeTool"/>
 			<Tool 
-				Name="PreBuildEventTool"/>
+				Name="PreBuildEventTool"
+				CommandLine="defaultconfig\SubWCRev.bat"/>
+			<Tool 
+				Name="PreLinkEventTool"/>
+			<Tool 
+				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
+			<Tool 
+				Name="MASM"/>
+		</Configuration>
+		<Configuration 
+			Name="Release FastBuild|x64">
+			<Tool 
+				Name="GeneralTool"
+				OutputDirectory="$(SolutionDir)\__bins"
+				IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
+				ConfigurationType="1"
+				WholeProgramOptimization="0"
+				InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"/>
+			<Tool 
+				Name="CppCmplrTool"
+				WholeProgramOptimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="1"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="1"
+				EnableFiberSafeOptimizations="1"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG"
+				StringPooling="1"
+				ExceptionHandling="1"
+				StructMemberAlignment="0"
+				BufferSecurityCheck="0"
+				EnableEnhancedInstructionSet="0"
+				WarningLevel="1"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"/>
+			<Tool 
+				Name="LinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)_x64_releaseFastBuild.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib;&quot;glib-2.20.1\lib&quot;;lua\lib;.\7z;.\agg"
+				AdditionalDependencies="agg-2.5-x64.lib lua-5.1.4-x64.lib glib-2.20.1-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\x64\dxguid.lib shell32.lib comdlg32.lib directx\x64\dxerr8.lib directx\x64\dsound.lib directx\x64\dinput8.lib directx\x64\ddraw.lib zlib-2005-x64.lib zziplib-2005-x64.lib shlwapi.lib winpcap\x64\wpcap.lib 7zip-x64.lib"
+				DelayLoadDLLs="wpcap.dll"
+				GenerateDebugInformation="1"
+				OptimizeReferences="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+				Profile="0"
+				DelayImpLib="DelayImp.lib"/>
+			<Tool 
+				Name="LibrarianTool"/>
+			<Tool 
+				Name="ResCmplrTool"/>
+			<Tool 
+				Name="MidlCmplrTool"
+				TargetEnvironment="3"/>
+			<Tool 
+				Name="BscMakeTool"/>
+			<Tool 
+				Name="PreBuildEventTool"
+				CommandLine="defaultconfig\SubWCRev.bat"/>
 			<Tool 
 				Name="PreLinkEventTool"/>
 			<Tool 
@ -135,204 +394,22 @@
 		</Configuration>
 	</Configurations>
 	<Files>
-		<File 
-			RelativePath="..\addons.h"/>
-		<File 
-			RelativePath="..\ARM9.h"/>
-		<File 
-			RelativePath="..\arm_instructions.h"/>
-		<File 
-			RelativePath="..\armcpu.h"/>
-		<File 
-			RelativePath="..\bios.h"/>
-		<File 
-			RelativePath="..\bits.h"/>
-		<File 
-			RelativePath="..\cflash.h"/>
-		<File 
-			RelativePath="..\cheatSystem.h"/>
-		<File 
-			RelativePath="..\commandline.h"/>
-		<File 
-			RelativePath="..\common.h"/>
-		<File 
-			RelativePath="..\cp15.h"/>
-		<File 
-			RelativePath="..\debug.h"/>
-		<File 
-			RelativePath="..\Disassembler.h"/>
-		<File 
-			RelativePath="..\dscard.h"/>
-		<File 
-			RelativePath="..\fat.h"/>
-		<File 
-			RelativePath="..\FIFO.h"/>
-		<File 
-			RelativePath="..\fs.h"/>
-		<File 
-			RelativePath="..\gdbstub.h"/>
-		<File 
-			RelativePath="..\gfx3d.h"/>
-		<File 
-			RelativePath="..\gl_vertex.h"/>
-		<File 
-			RelativePath="..\GPU.h"/>
-		<File 
-			RelativePath="..\GPU_osd.h"/>
-		<File 
-			RelativePath="..\matrix.h"/>
-		<File 
-			RelativePath="..\mc.h"/>
-		<File 
-			RelativePath="..\mem.h"/>
-		<File 
-			RelativePath="..\memorystream.h"/>
-		<File 
-			RelativePath="..\mic.h"/>
-		<File 
-			RelativePath="..\MMU.h"/>
-		<File 
-			RelativePath="..\movie.h"/>
-		<File 
-			RelativePath="..\NDSSystem.h"/>
-		<File 
-			RelativePath="..\OGLRender.h"/>
-		<File 
-			RelativePath="..\rasterize.h"/>
-		<File 
-			RelativePath="..\readwrite.h"/>
-		<File 
-			RelativePath="..\registers.h"/>
-		<File 
-			RelativePath="..\render3D.h"/>
-		<File 
-			RelativePath="..\ROMReader.h"/>
-		<File 
-			RelativePath="..\rtc.h"/>
-		<File 
-			RelativePath="..\saves.h"/>
-		<File 
-			RelativePath="..\shaders.h"/>
-		<File 
-			RelativePath="..\softrender.h"/>
-		<File 
-			RelativePath="..\softrender_config.h"/>
-		<File 
-			RelativePath="..\SPU.h"/>
-		<File 
-			RelativePath="..\texcache.h"/>
-		<File 
-			RelativePath="..\thumb_instructions.h"/>
-		<File 
-			RelativePath="..\types.h"/>
-		<File 
-			RelativePath="..\wifi.h"/>
-		<File 
-			RelativePath=".\userconfig\userconfig.h"/>
-		<File 
-			RelativePath=".\AboutBox.h"/>
-		<File 
-			RelativePath=".\aviout.h"/>
-		<File 
-			RelativePath=".\cheatsWin.h"/>
-		<File 
-			RelativePath=".\colorctrl.h"/>
-		<File 
-			RelativePath=".\console.h"/>
-		<File 
-			RelativePath=".\CWindow.h"/>
-		<File 
-			RelativePath=".\disView.h"/>
-		<File 
-			RelativePath=".\FirmConfig.h"/>
-		<File 
-			RelativePath=".\gbaslot_config.h"/>
-		<File 
-			RelativePath=".\ginfo.h"/>
-		<File 
-			RelativePath=".\hotkey.h"/>
-		<File 
-			RelativePath=".\inputdx.h"/>
-		<File 
-			RelativePath=".\IORegView.h"/>
-		<File 
-			RelativePath=".\lightView.h"/>
-		<File 
-			RelativePath=".\main.h"/>
-		<File 
-			RelativePath=".\mapView.h"/>
-		<File 
-			RelativePath=".\matrixView.h"/>
-		<File 
-			RelativePath=".\memView.h"/>
-		<File 
-			RelativePath=".\oamView.h"/>
-		<File 
-			RelativePath=".\palView.h"/>
-		<File 
-			RelativePath=".\ram_search.h"/>
-		<File 
-			RelativePath=".\ramwatch.h"/>
-		<File 
-			RelativePath=".\replay.h"/>
-		<File 
-			RelativePath=".\resource.h"/>
-		<File 
-			RelativePath=".\snddx.h"/>
-		<File 
-			RelativePath=".\soundView.h"/>
-		<File 
-			RelativePath=".\throttle.h"/>
-		<File 
-			RelativePath=".\tileView.h"/>
-		<File 
-			RelativePath=".\wavout.h"/>
-		<File 
-			RelativePath="..\font_eng.inc"/>
-		<File 
-			RelativePath="..\instruction_tabdef.inc"/>
-		<File 
-			RelativePath="..\thumb_tabdef.inc"/>
-		<File 
-			RelativePath=".\bitmap1.bmp"/>
-		<File 
-			RelativePath=".\DeSmuME.ico"/>
-		<File 
-			RelativePath=".\resources.rc"/>
 		<File 
 			RelativePath="..\addons\compactFlash.cpp"/>
+		<File 
+			RelativePath="..\addons\expMemory.cpp"/>
 		<File 
 			RelativePath="..\addons\gbagame.cpp"/>
+		<File 
+			RelativePath="..\addons\guitarGrip.cpp"/>
 		<File 
 			RelativePath="..\addons\none.cpp"/>
 		<File 
 			RelativePath="..\addons\rumblepak.cpp"/>
 		<File 
-			RelativePath="..\matrix_sse2-x64.asm">
-			<FileConfiguration 
-				Name="Debug|Win32">
-				<Tool 
-					Name="GeneralTool"
-					ExcludedFromBuild="1"/>
-				<Tool 
-					Name="CustomTool"
-					Description="Assembling x64..."
-					CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#xA;"/>
-			</FileConfiguration>
-			<FileConfiguration 
-				Name="Release|Win32">
-				<Tool 
-					Name="GeneralTool"
-					ExcludedFromBuild="1"/>
-				<Tool 
-					Name="CustomTool"
-					Description="Assembling x64..."
-					CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#xA;"
-					Outputs="$(IntDir)\$(InputName).obj"/>
-			</FileConfiguration>
-		</File>
+			RelativePath="..\gdbstub\gdbstub.cpp"/>
 		<File 
-			RelativePath="..\matrix_sse2-x86.asm"/>
+			RelativePath="..\gdbstub.h"/>
 		<File 
 			RelativePath="..\utils\decrypt\crc.cpp"/>
 		<File 
@ -365,16 +442,28 @@
 			RelativePath="..\utils\xstring.h"/>
 		<File 
 			RelativePath="..\addons.cpp"/>
+		<File 
+			RelativePath="..\addons.h"/>
+		<File 
+			RelativePath="..\aggdraw.cpp"/>
 		<File 
 			RelativePath="..\arm_instructions.cpp"/>
+		<File 
+			RelativePath="..\arm_instructions.h"/>
 		<File 
 			RelativePath="..\armcpu.cpp"/>
+		<File 
+			RelativePath="..\armcpu.h"/>
 		<File 
 			RelativePath="..\bios.cpp"/>
 		<File 
-			RelativePath="..\cflash.cpp"/>
+			RelativePath="..\bios.h"/>
+		<File 
+			RelativePath="..\bits.h"/>
 		<File 
 			RelativePath="..\cheatSystem.cpp"/>
+		<File 
+			RelativePath="..\cheatSystem.h"/>
 		<File 
 			RelativePath="..\commandline.cpp">
 			<FileConfiguration 
@ -383,117 +472,313 @@
 					Name="CppCmplrTool"
 					CallingConvention="0"/>
 			</FileConfiguration>
+			<FileConfiguration 
+				Name="Release FastBuild|Win32">
+				<Tool 
+					Name="CppCmplrTool"
+					CallingConvention="0"/>
+			</FileConfiguration>
+			<FileConfiguration 
+				Name="Release|x64">
+				<Tool 
+					Name="CppCmplrTool"
+					CallingConvention="0"/>
+			</FileConfiguration>
+			<FileConfiguration 
+				Name="Release FastBuild|x64">
+				<Tool 
+					Name="CppCmplrTool"
+					CallingConvention="0"/>
+			</FileConfiguration>
 		</File>
+		<File 
+			RelativePath="..\commandline.h"/>
 		<File 
 			RelativePath="..\common.cpp"/>
+		<File 
+			RelativePath="..\common.h"/>
 		<File 
 			RelativePath="..\cp15.cpp"/>
+		<File 
+			RelativePath="..\cp15.h"/>
 		<File 
 			RelativePath="..\debug.cpp"/>
+		<File 
+			RelativePath="..\debug.h"/>
 		<File 
 			RelativePath="..\Disassembler.cpp"/>
+		<File 
+			RelativePath="..\Disassembler.h"/>
+		<File 
+			RelativePath="..\driver.h"/>
+		<File 
+			RelativePath="..\emufile.cpp"/>
+		<File 
+			RelativePath="..\emufile.h"/>
+		<File 
+			RelativePath="..\fat.h"/>
 		<File 
 			RelativePath="..\FIFO.cpp"/>
+		<File 
+			RelativePath="..\FIFO.h"/>
 		<File 
 			RelativePath="..\fs-windows.cpp"/>
+		<File 
+			RelativePath="..\fs.h"/>
 		<File 
 			RelativePath="..\gfx3d.cpp"/>
+		<File 
+			RelativePath="..\gfx3d.h"/>
 		<File 
 			RelativePath="..\GPU.cpp"/>
+		<File 
+			RelativePath="..\GPU.h"/>
 		<File 
 			RelativePath="..\GPU_OSD.cpp"/>
+		<File 
+			RelativePath="..\GPU_osd.h"/>
+		<File 
+			RelativePath="..\instruction_tabdef.inc"/>
+		<File 
+			RelativePath="..\lua-engine.cpp"/>
+		<File 
+			RelativePath="..\lua-engine.h"/>
 		<File 
 			RelativePath="..\matrix.cpp"/>
+		<File 
+			RelativePath="..\matrix.h"/>
 		<File 
 			RelativePath="..\mc.cpp"/>
+		<File 
+			RelativePath="..\mc.h"/>
+		<File 
+			RelativePath="..\mem.h"/>
+		<File 
+			RelativePath="..\mic.h"/>
 		<File 
 			RelativePath="..\MMU.cpp"/>
+		<File 
+			RelativePath="..\MMU.h"/>
 		<File 
 			RelativePath="..\movie.cpp"/>
+		<File 
+			RelativePath="..\movie.h"/>
 		<File 
 			RelativePath="..\NDSSystem.cpp"/>
+		<File 
+			RelativePath="..\NDSSystem.h"/>
 		<File 
 			RelativePath="..\OGLRender.cpp"/>
+		<File 
+			RelativePath="..\OGLRender.h"/>
+		<File 
+			RelativePath="..\path.h"/>
 		<File 
 			RelativePath="..\rasterize.cpp"/>
+		<File 
+			RelativePath="..\rasterize.h"/>
 		<File 
 			RelativePath="..\readwrite.cpp"/>
+		<File 
+			RelativePath="..\readwrite.h"/>
+		<File 
+			RelativePath="..\registers.h"/>
 		<File 
 			RelativePath="..\render3D.cpp"/>
+		<File 
+			RelativePath="..\render3D.h"/>
 		<File 
 			RelativePath="..\ROMReader.cpp"/>
+		<File 
+			RelativePath="..\ROMReader.h"/>
 		<File 
 			RelativePath="..\rtc.cpp"/>
+		<File 
+			RelativePath="..\rtc.h"/>
 		<File 
 			RelativePath="..\saves.cpp"/>
 		<File 
-			RelativePath="..\softrender.cpp"/>
+			RelativePath="..\saves.h"/>
+		<File 
+			RelativePath="..\shaders.h"/>
+		<File 
+			RelativePath="..\softrender.h"/>
+		<File 
+			RelativePath="..\softrender_config.h"/>
+		<File 
+			RelativePath="..\softrender_desmumefont.h"/>
+		<File 
+			RelativePath="..\softrender_v3sysfont.h"/>
 		<File 
 			RelativePath="..\SPU.cpp"/>
+		<File 
+			RelativePath="..\SPU.h"/>
 		<File 
 			RelativePath="..\texcache.cpp"/>
+		<File 
+			RelativePath="..\texcache.h"/>
 		<File 
 			RelativePath="..\thumb_instructions.cpp"/>
+		<File 
+			RelativePath="..\thumb_instructions.h"/>
+		<File 
+			RelativePath="..\thumb_tabdef.inc"/>
+		<File 
+			RelativePath="..\types.h"/>
+		<File 
+			RelativePath="..\version.h"/>
 		<File 
 			RelativePath="..\wifi.cpp"/>
 		<File 
-			RelativePath=".\AboutBox.cpp"/>
+			RelativePath="..\wifi.h"/>
 		<File 
-			RelativePath=".\aviout.cpp"/>
+			RelativePath=".\filter\2xsai.cpp"/>
 		<File 
-			RelativePath=".\cheatsWin.cpp"/>
+			RelativePath=".\filter\bilinear.cpp"/>
 		<File 
-			RelativePath=".\colorctrl.cpp"/>
+			RelativePath=".\filter\filter.h"/>
 		<File 
-			RelativePath=".\console.cpp"/>
+			RelativePath=".\filter\hq2x.cpp"/>
 		<File 
-			RelativePath=".\CWindow.cpp"/>
+			RelativePath=".\filter\scanline.cpp"/>
+		<File 
+			RelativePath=".\bitmap1.bmp"/>
+		<File 
+			RelativePath=".\DeSmuME.ico"/>
+		<File 
+			RelativePath=".\resources.rc"/>
 		<File 
 			RelativePath=".\disView.cpp"/>
 		<File 
-			RelativePath=".\FirmConfig.cpp"/>
-		<File 
-			RelativePath=".\gbaslot_config.cpp"/>
-		<File 
-			RelativePath=".\ginfo.cpp"/>
-		<File 
-			RelativePath=".\hotkey.cpp"/>
-		<File 
-			RelativePath=".\inputdx.cpp"/>
+			RelativePath=".\disView.h"/>
 		<File 
 			RelativePath=".\IORegView.cpp"/>
+		<File 
+			RelativePath=".\IORegView.h"/>
 		<File 
 			RelativePath=".\lightView.cpp"/>
 		<File 
-			RelativePath=".\main.cpp"/>
+			RelativePath=".\lightView.h"/>
 		<File 
 			RelativePath=".\mapView.cpp"/>
+		<File 
+			RelativePath=".\mapView.h"/>
 		<File 
 			RelativePath=".\matrixView.cpp"/>
+		<File 
+			RelativePath=".\matrixView.h"/>
 		<File 
 			RelativePath=".\memView.cpp"/>
 		<File 
-			RelativePath=".\mic.cpp"/>
+			RelativePath=".\memView.h"/>
 		<File 
 			RelativePath=".\oamView.cpp"/>
 		<File 
-			RelativePath=".\ogl.cpp"/>
+			RelativePath=".\oamView.h"/>
 		<File 
 			RelativePath=".\palView.cpp"/>
+		<File 
+			RelativePath=".\palView.h"/>
 		<File 
 			RelativePath=".\ram_search.cpp"/>
+		<File 
+			RelativePath=".\ram_search.h"/>
 		<File 
 			RelativePath=".\ramwatch.cpp"/>
 		<File 
-			RelativePath=".\replay.cpp"/>
-		<File 
-			RelativePath=".\snddx.cpp"/>
+			RelativePath=".\ramwatch.h"/>
 		<File 
 			RelativePath=".\soundView.cpp"/>
 		<File 
-			RelativePath=".\throttle.cpp"/>
+			RelativePath=".\soundView.h"/>
 		<File 
 			RelativePath=".\tileView.cpp"/>
+		<File 
+			RelativePath=".\tileView.h"/>
+		<File 
+			RelativePath=".\userconfig\userconfig.h"/>
+		<File 
+			RelativePath=".\7zip.cpp"/>
+		<File 
+			RelativePath=".\7zip.h"/>
+		<File 
+			RelativePath=".\7zipstreams.h"/>
+		<File 
+			RelativePath=".\AboutBox.cpp"/>
+		<File 
+			RelativePath=".\AboutBox.h"/>
+		<File 
+			RelativePath=".\aviout.cpp"/>
+		<File 
+			RelativePath=".\aviout.h"/>
+		<File 
+			RelativePath=".\cheatsWin.cpp"/>
+		<File 
+			RelativePath=".\cheatsWin.h"/>
+		<File 
+			RelativePath=".\colorctrl.cpp"/>
+		<File 
+			RelativePath=".\colorctrl.h"/>
+		<File 
+			RelativePath=".\console.cpp"/>
+		<File 
+			RelativePath=".\console.h"/>
+		<File 
+			RelativePath=".\CWindow.cpp"/>
+		<File 
+			RelativePath=".\CWindow.h"/>
+		<File 
+			RelativePath=".\FirmConfig.cpp"/>
+		<File 
+			RelativePath=".\FirmConfig.h"/>
+		<File 
+			RelativePath=".\gbaslot_config.cpp"/>
+		<File 
+			RelativePath=".\gbaslot_config.h"/>
+		<File 
+			RelativePath=".\ginfo.cpp"/>
+		<File 
+			RelativePath=".\ginfo.h"/>
+		<File 
+			RelativePath=".\hotkey.cpp"/>
+		<File 
+			RelativePath=".\hotkey.h"/>
+		<File 
+			RelativePath=".\inputdx.cpp"/>
+		<File 
+			RelativePath=".\inputdx.h"/>
+		<File 
+			RelativePath=".\luaconsole.cpp"/>
+		<File 
+			RelativePath=".\main.cpp"/>
+		<File 
+			RelativePath=".\main.h"/>
+		<File 
+			RelativePath=".\mic.cpp"/>
+		<File 
+			RelativePath=".\ogl.cpp"/>
+		<File 
+			RelativePath=".\OpenArchive.cpp"/>
+		<File 
+			RelativePath=".\OpenArchive.h"/>
+		<File 
+			RelativePath=".\pathsettings.cpp"/>
+		<File 
+			RelativePath=".\pathsettings.h"/>
+		<File 
+			RelativePath=".\replay.cpp"/>
+		<File 
+			RelativePath=".\replay.h"/>
+		<File 
+			RelativePath=".\resource.h"/>
+		<File 
+			RelativePath=".\snddx.cpp"/>
+		<File 
+			RelativePath=".\snddx.h"/>
+		<File 
+			RelativePath=".\throttle.cpp"/>
+		<File 
+			RelativePath=".\throttle.h"/>
 	</Files>
 </VisualStudioProject>

--- a/desmume/src/windows/DeSmuME_Intel.sln
+++ b/desmume/src/windows/DeSmuME_Intel.sln
@ -1,22 +1,32 @@

 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "DeSmuME_Intel", "DeSmuME_Intel.icproj", "{439F53E2-431F-4F28-9058-C6A9B00B503F}"
+Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "DeSmuME_Intel", "DeSmuME_Intel.icproj", "{61FB2DAF-A8E9-4CCC-ADF4-B824B4F00187}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{439F53E2-431F-4F28-9058-C6A9B00B503F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{439F53E2-431F-4F28-9058-C6A9B00B503F}.Debug|Win32.Build.0 = Debug|Win32
-		{439F53E2-431F-4F28-9058-C6A9B00B503F}.Release|Win32.ActiveCfg = Release|Win32
-		{439F53E2-431F-4F28-9058-C6A9B00B503F}.Release|Win32.Build.0 = Release|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.Build.0 = Release|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.ActiveCfg = Release|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.Build.0 = Debug|Win32
+		{61FB2DAF-A8E9-4CCC-ADF4-B824B4F00187}.Debug|Win32.ActiveCfg = Debug|Win32
+		{61FB2DAF-A8E9-4CCC-ADF4-B824B4F00187}.Debug|Win32.Build.0 = Debug|Win32
+		{61FB2DAF-A8E9-4CCC-ADF4-B824B4F00187}.Debug|x64.ActiveCfg = Debug|x64
+		{61FB2DAF-A8E9-4CCC-ADF4-B824B4F00187}.Debug|x64.Build.0 = Debug|x64
+		{61FB2DAF-A8E9-4CCC-ADF4-B824B4F00187}.Release|Win32.ActiveCfg = Release|Win32
+		{61FB2DAF-A8E9-4CCC-ADF4-B824B4F00187}.Release|Win32.Build.0 = Release|Win32
+		{61FB2DAF-A8E9-4CCC-ADF4-B824B4F00187}.Release|x64.ActiveCfg = Release|x64
+		{61FB2DAF-A8E9-4CCC-ADF4-B824B4F00187}.Release|x64.Build.0 = Release|x64
 		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.Build.0 = Debug|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.ActiveCfg = Debug|x64
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.Build.0 = Debug|x64
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.ActiveCfg = Release|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.Build.0 = Release|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.ActiveCfg = Release|x64
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/desmume/src/windows/DeSmuME_Intel.vcproj
+++ b/desmume/src/windows/DeSmuME_Intel.vcproj