From 5b4bac440b2e87fa1c570565e25f3c34ca4e6068 Mon Sep 17 00:00:00 2001
From: mtabachenko <mtabachenko@users.sf.net>
Date: Tue, 23 Sep 2008 15:59:32 +0000
Subject: [PATCH] - fix for compiling with Intel C++; win port: - add Intel C++
 project (fastest builds on Intel CPU).

---
 desmume/src/GPU_osd.cpp                  |   4 +-
 desmume/src/NDSSystem.cpp                |   2 +-
 desmume/src/OGLRender.cpp                |   2 +-
 desmume/src/fat.h                        |   2 +-
 desmume/src/matrix.h                     |  15 +-
 desmume/src/types.h                      |  10 +-
 desmume/src/windows/DeSmuME_Intel.icproj | 679 +++++++++++++++++++++++
 7 files changed, 690 insertions(+), 24 deletions(-)
 create mode 100644 desmume/src/windows/DeSmuME_Intel.icproj

diff --git a/desmume/src/GPU_osd.cpp b/desmume/src/GPU_osd.cpp
index f978a45a9..9e0501f70 100644
--- a/desmume/src/GPU_osd.cpp
+++ b/desmume/src/GPU_osd.cpp
@@ -95,7 +95,7 @@ void INLINE OSDCLASS::printChar(u16 x, u16 y, u8 c)
 {
 	int i, j;
 	int ofs=c*OSD_FONT_HEIGHT;
-	unsigned char	bits[9]={256, 128, 64, 32, 16, 8, 4, 2, 1};
+	unsigned char	bits[9]={255, 128, 64, 32, 16, 8, 4, 2, 1};
 	u8	*dst=screen;
 	dst+=(y*256)+x;
 
@@ -138,7 +138,7 @@ void OSDCLASS::addFixed(u16 x, u16 y, const char *fmt, ...)
 //	memset(msg,0,512);
 
 	va_start(list,fmt);
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 		_vsnprintf(msg,511,fmt,list);
 #else
 		vsnprintf(msg,511,fmt,list);
diff --git a/desmume/src/NDSSystem.cpp b/desmume/src/NDSSystem.cpp
index 754f451ed..b4c77ceb6 100644
--- a/desmume/src/NDSSystem.cpp
+++ b/desmume/src/NDSSystem.cpp
@@ -573,7 +573,7 @@ typedef struct
     u32 numimpcol;
 } bmpimgheader_struct;
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 #pragma pack(push, 1)
 typedef struct
 {
diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp
index 2a88af401..c77bcab4d 100644
--- a/desmume/src/OGLRender.cpp
+++ b/desmume/src/OGLRender.cpp
@@ -374,7 +374,7 @@ void Close()
 //I think this is slower than the regular memcmp.. doesnt make sense to me, but my
 //asm optimization knowlege is 15 years old..
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 int memcmp_slow(const void* src, const void* dst, u32 count) {
 	int retval;
 	__asm {
diff --git a/desmume/src/fat.h b/desmume/src/fat.h
index 49ecb20b8..cdb8890cb 100644
--- a/desmume/src/fat.h
+++ b/desmume/src/fat.h
@@ -18,7 +18,7 @@
 #define EXT_LEN 3
 
 // Boot Sector - must be packed
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 #pragma pack(push, 1)
 #define DIR_SEP "\\"
 typedef struct
diff --git a/desmume/src/matrix.h b/desmume/src/matrix.h
index a104a8c68..f49c484d2 100644
--- a/desmume/src/matrix.h
+++ b/desmume/src/matrix.h
@@ -25,29 +25,16 @@
 
 extern "C" {
 
-#ifdef SSE2
-	#include <xmmintrin.h>
-	#include <emmintrin.h>
-	//typedef __declspec(align(16)) float gMatrix[4][4];
-	//typedef float gMatrix[4][4];
-	typedef float gMatrix[16];
-#endif
-
 typedef struct MatrixStack
 {
-#ifdef SSE2
-	//gMatrix *matrix;
 	float	*matrix;
-#else
-	float	*matrix;
-#endif
 	int		position;
 	int		size;
 } MatrixStack;
 
 void	MatrixInit				(float *matrix);
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 #define MATRIXFASTCALL __fastcall
 #else
 #define MATRIXFASTCALL
diff --git a/desmume/src/types.h b/desmume/src/types.h
index ba987e592..0597f2453 100644
--- a/desmume/src/types.h
+++ b/desmume/src/types.h
@@ -31,7 +31,7 @@
 #define WINAPI
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 #define ALIGN(X) __declspec(align(X))
 #elif __GNUC__
 #define ALIGN(X) __attribute__ ((aligned (X)))
@@ -46,7 +46,7 @@
 #define FASTCALL __attribute__((fastcall))
 #elif defined (__i386__)
 #define FASTCALL __attribute__((regparm(3)))
-#elif defined _MSC_VER
+#elif defined(_MSC_VER) || defined(__INTEL_COMPILER)
 #define FASTCALL
 #else
 #define FASTCALL
@@ -54,7 +54,7 @@
 #endif
 
 #ifndef INLINE
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 #define INLINE _inline
 #else
 #define INLINE inline
@@ -84,7 +84,7 @@ typedef signed long s64;
 typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned long u32;
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 typedef unsigned __int64 u64;
 #else
 typedef unsigned long long u64;
@@ -94,7 +94,7 @@ typedef unsigned long pointer;
 typedef signed char s8;
 typedef signed short s16;
 typedef signed long s32;
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 typedef __int64 s64;
 #else
 typedef signed long long s64;
diff --git a/desmume/src/windows/DeSmuME_Intel.icproj b/desmume/src/windows/DeSmuME_Intel.icproj
new file mode 100644
index 000000000..72ca9d2da
--- /dev/null
+++ b/desmume/src/windows/DeSmuME_Intel.icproj
@@ -0,0 +1,679 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject 
+	ProjectType="Intel C++ Project"
+	Version="10.1"
+	Name="DeSmuME_Intel"
+	ProjectGUID="{F26376D4-B1A6-4ACC-9B2C-5CB92B9E7B80}"
+	VCNestedProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
+	VCNestedProjectCRC32="1511626194"
+	VCNestedProjectFileName="DeSmuME_Intel.vcproj">
+	<Platforms>
+		<Platform 
+			Name="Win32"/>
+		<Platform 
+			Name="x64"/>
+	</Platforms>
+	<Configurations>
+		<Configuration 
+			Name="Debug|Win32">
+			<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="..;.\zlib123;.\zziplib"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;DEBUG (Intel)\&quot;;WIN32;BETA_VERSION;SPU_INTERPOLATE"
+				ExceptionHandling="1"
+				BufferSecurityCheck="0"
+				EnableEnhancedInstructionSet="0"
+				DebugInformationFormat="4"
+				CallingConvention="1"
+				CompileAs="0"/>
+			<Tool 
+				Name="LinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)_Intel_debug.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
+				AdditionalDependencies="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"
+				GenerateDebugInformation="1"
+				GenerateMapFile="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				DelayImpLib=""/>
+			<Tool 
+				Name="LibrarianTool"/>
+			<Tool 
+				Name="ResCmplrTool"/>
+			<Tool 
+				Name="MidlCmplrTool"/>
+			<Tool 
+				Name="BscMakeTool"/>
+			<Tool 
+				Name="PreBuildEventTool"/>
+			<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="..;.\zlib123;.\zziplib"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;x64 DEBUG (Intel)\&quot;;WIN32;_x64;BETA_VERSION;SPU_INTERPOLATE"
+				ExceptionHandling="1"
+				BufferSecurityCheck="0"
+				EnableEnhancedInstructionSet="0"
+				DebugInformationFormat="3"
+				CallingConvention="1"
+				CompileAs="0"/>
+			<Tool 
+				Name="LinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)_x64_debug.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
+				AdditionalDependencies="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"
+				GenerateDebugInformation="1"
+				GenerateMapFile="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+				DelayImpLib=""/>
+			<Tool 
+				Name="LibrarianTool"/>
+			<Tool 
+				Name="ResCmplrTool"/>
+			<Tool 
+				Name="MidlCmplrTool"
+				TargetEnvironment="3"/>
+			<Tool 
+				Name="BscMakeTool"/>
+			<Tool 
+				Name="PreBuildEventTool"/>
+			<Tool 
+				Name="PreLinkEventTool"/>
+			<Tool 
+				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
+			<Tool 
+				Name="MASM"/>
+		</Configuration>
+		<Configuration 
+			Name="Release (SSE2)|Win32">
+			<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="1000"
+				GlobalOptimizations="1"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="1"
+				EnableFiberSafeOptimizations="1"
+				OptimizeForWindowsApplication="1"
+				AdditionalIncludeDirectories="..;.\zlib123;.\zziplib"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;SSE2 (Intel)\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				StringPooling="1"
+				ExceptionHandling="1"
+				BufferSecurityCheck="0"
+				EnableEnhancedInstructionSet="0"
+				WarningLevel="1"
+				DebugInformationFormat="3"
+				CallingConvention="1"
+				CompileAs="0"
+				UseProcExt="5"
+				Parallelization="1"/>
+			<Tool 
+				Name="LinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)_Intel_sse2.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
+				AdditionalDependencies="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 zlib-2008-x32.lib zziplib-2008-x32.lib"
+				GenerateDebugInformation="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+				Profile="0"
+				DelayImpLib=""/>
+			<Tool 
+				Name="LibrarianTool"/>
+			<Tool 
+				Name="ResCmplrTool"/>
+			<Tool 
+				Name="MidlCmplrTool"/>
+			<Tool 
+				Name="BscMakeTool"/>
+			<Tool 
+				Name="PreBuildEventTool"/>
+			<Tool 
+				Name="PreLinkEventTool"/>
+			<Tool 
+				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
+			<Tool 
+				Name="MASM"/>
+		</Configuration>
+		<Configuration 
+			Name="Release (SSE2)|x64">
+			<Tool 
+				Name="GeneralTool"
+				OutputDirectory="$(SolutionDir)\__bins"
+				IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
+				ConfigurationType="1"
+				InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"/>
+			<Tool 
+				Name="CppCmplrTool"
+				WholeProgramOptimization="1"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="1"
+				FavorSizeOrSpeed="1"
+				EnableFiberSafeOptimizations="1"
+				AdditionalIncludeDirectories="..;.\zlib123;.\zziplib"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;x64 SSE2 (Intel)\&quot;;WIN32;_x64;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE"
+				ExceptionHandling="1"
+				BufferSecurityCheck="0"
+				EnableEnhancedInstructionSet="0"
+				WarningLevel="1"
+				DebugInformationFormat="3"
+				CallingConvention="1"
+				CompileAs="0"/>
+			<Tool 
+				Name="LinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)_x64_sse2.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
+				AdditionalDependencies="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-2008-x64.lib zziplib-2008-x64.lib"
+				GenerateDebugInformation="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+				Profile="1"
+				DelayImpLib=""/>
+			<Tool 
+				Name="LibrarianTool"/>
+			<Tool 
+				Name="ResCmplrTool"/>
+			<Tool 
+				Name="MidlCmplrTool"
+				TargetEnvironment="3"/>
+			<Tool 
+				Name="BscMakeTool"/>
+			<Tool 
+				Name="PreBuildEventTool"/>
+			<Tool 
+				Name="PreLinkEventTool"/>
+			<Tool 
+				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
+			<Tool 
+				Name="MASM"/>
+		</Configuration>
+		<Configuration 
+			Name="Release|Win32">
+			<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="1000"
+				GlobalOptimizations="1"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="1"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="1"
+				EnableFiberSafeOptimizations="1"
+				OptimizeForWindowsApplication="1"
+				AdditionalIncludeDirectories="..;.\zlib123;.\zziplib"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;(Intel)\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				StringPooling="1"
+				ExceptionHandling="1"
+				BufferSecurityCheck="0"
+				EnableEnhancedInstructionSet="2"
+				WarningLevel="1"
+				DebugInformationFormat="3"
+				CallingConvention="1"
+				CompileAs="0"
+				UseProcExt="3"
+				Parallelization="1"/>
+			<Tool 
+				Name="LinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)_Intel.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
+				AdditionalDependencies="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 zlib-2008-x32.lib zziplib-2008-x32.lib"
+				GenerateDebugInformation="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+				Profile="1"
+				DelayImpLib=""/>
+			<Tool 
+				Name="LibrarianTool"/>
+			<Tool 
+				Name="ResCmplrTool"/>
+			<Tool 
+				Name="MidlCmplrTool"/>
+			<Tool 
+				Name="BscMakeTool"/>
+			<Tool 
+				Name="PreBuildEventTool"/>
+			<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"
+				InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"/>
+			<Tool 
+				Name="CppCmplrTool"
+				WholeProgramOptimization="1"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="1"
+				FavorSizeOrSpeed="1"
+				EnableFiberSafeOptimizations="1"
+				AdditionalIncludeDirectories="..;.\zlib123;.\zziplib"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;x64 SSE2 (Intel)\&quot;;WIN32;_x64;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE"
+				ExceptionHandling="1"
+				BufferSecurityCheck="0"
+				EnableEnhancedInstructionSet="0"
+				WarningLevel="1"
+				DebugInformationFormat="3"
+				CallingConvention="1"
+				CompileAs="0"/>
+			<Tool 
+				Name="LinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)_x64_sse2.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
+				AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x64.lib zziplib-2008-x64.lib"
+				GenerateDebugInformation="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+				Profile="1"
+				DelayImpLib=""/>
+			<Tool 
+				Name="LibrarianTool"/>
+			<Tool 
+				Name="ResCmplrTool"/>
+			<Tool 
+				Name="MidlCmplrTool"
+				TargetEnvironment="3"/>
+			<Tool 
+				Name="BscMakeTool"/>
+			<Tool 
+				Name="PreBuildEventTool"/>
+			<Tool 
+				Name="PreLinkEventTool"/>
+			<Tool 
+				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
+			<Tool 
+				Name="MASM"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<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="..\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="..\MMU.h"/>
+		<File 
+			RelativePath="..\NDSSystem.h"/>
+		<File 
+			RelativePath="..\OGLRender.h"/>
+		<File 
+			RelativePath="..\readwrite.h"/>
+		<File 
+			RelativePath="..\registers.h"/>
+		<File 
+			RelativePath="..\render3D.h"/>
+		<File 
+			RelativePath="..\ROMReader.h"/>
+		<File 
+			RelativePath="..\saves.h"/>
+		<File 
+			RelativePath="..\SPU.h"/>
+		<File 
+			RelativePath="..\thumb_instructions.h"/>
+		<File 
+			RelativePath="..\types.h"/>
+		<File 
+			RelativePath="..\wifi.h"/>
+		<File 
+			RelativePath=".\AboutBox.h"/>
+		<File 
+			RelativePath=".\colorconv.h"/>
+		<File 
+			RelativePath=".\colorctrl.h"/>
+		<File 
+			RelativePath=".\ConfigKeys.h"/>
+		<File 
+			RelativePath=".\console.h"/>
+		<File 
+			RelativePath=".\CWindow.h"/>
+		<File 
+			RelativePath=".\disView.h"/>
+		<File 
+			RelativePath=".\FirmConfig.h"/>
+		<File 
+			RelativePath=".\ginfo.h"/>
+		<File 
+			RelativePath=".\IORegView.h"/>
+		<File 
+			RelativePath=".\lightView.h"/>
+		<File 
+			RelativePath=".\mapView.h"/>
+		<File 
+			RelativePath=".\matrixView.h"/>
+		<File 
+			RelativePath=".\memView.h"/>
+		<File 
+			RelativePath=".\oamView.h"/>
+		<File 
+			RelativePath=".\palView.h"/>
+		<File 
+			RelativePath=".\resource.h"/>
+		<File 
+			RelativePath=".\snddx.h"/>
+		<File 
+			RelativePath=".\throttle.h"/>
+		<File 
+			RelativePath=".\tileView.h"/>
+		<File 
+			RelativePath="..\font_eng.inc"/>
+		<File 
+			RelativePath="..\instruction_tabdef.inc"/>
+		<File 
+			RelativePath="..\thumb_tabdef.inc"/>
+		<File 
+			RelativePath=".\DeSmuME.ico"/>
+		<File 
+			RelativePath=".\NintendoDS(tm)_logo.bmp"/>
+		<File 
+			RelativePath=".\resources.rc"/>
+		<File 
+			RelativePath="..\arm_instructions.cpp"/>
+		<File 
+			RelativePath="..\armcpu.cpp"/>
+		<File 
+			RelativePath="..\bios.cpp"/>
+		<File 
+			RelativePath="..\cflash.cpp"/>
+		<File 
+			RelativePath="..\common.cpp"/>
+		<File 
+			RelativePath="..\cp15.cpp"/>
+		<File 
+			RelativePath="..\debug.cpp"/>
+		<File 
+			RelativePath="..\Disassembler.cpp"/>
+		<File 
+			RelativePath="..\FIFO.cpp"/>
+		<File 
+			RelativePath="..\gfx3d.cpp"/>
+		<File 
+			RelativePath="..\gl_vertex.cpp"/>
+		<File 
+			RelativePath="..\GPU.cpp"/>
+		<File 
+			RelativePath="..\GPU_OSD.cpp"/>
+		<File 
+			RelativePath="..\matrix.cpp"/>
+		<File 
+			RelativePath="..\matrix_sse2-x64.asm">
+			<FileConfiguration 
+				Name="Debug|Win32">
+				<Tool 
+					Name="GeneralTool"
+					ExcludedFromBuild="1"/>
+			</FileConfiguration>
+			<FileConfiguration 
+				Name="Debug|x64">
+				<Tool 
+					Name="GeneralTool"
+					ExcludedFromBuild="1"/>
+			</FileConfiguration>
+			<FileConfiguration 
+				Name="Release (SSE2)|Win32">
+				<Tool 
+					Name="GeneralTool"
+					ExcludedFromBuild="1"/>
+				<Tool 
+					Name="CustomTool"
+					Description="Assembling..."
+					CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#xA;"
+					Outputs="$(IntDir)\$(InputName).obj"/>
+			</FileConfiguration>
+			<FileConfiguration 
+				Name="Release (SSE2)|x64">
+				<Tool 
+					Name="CustomTool"
+					Description="Assembling..."
+					CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#xA;"
+					Outputs="$(IntDir)\$(InputName).obj"/>
+			</FileConfiguration>
+			<FileConfiguration 
+				Name="Release|Win32">
+				<Tool 
+					Name="GeneralTool"
+					ExcludedFromBuild="1"/>
+				<Tool 
+					Name="CustomTool"
+					Description="Assembling..."
+					CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#xA;"
+					Outputs="$(IntDir)\$(InputName).obj"/>
+			</FileConfiguration>
+			<FileConfiguration 
+				Name="Release|x64">
+				<Tool 
+					Name="GeneralTool"
+					ExcludedFromBuild="1"/>
+				<Tool 
+					Name="CustomTool"
+					Description="Assembling..."
+					CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#xA;"
+					Outputs="$(IntDir)\$(InputName).obj"/>
+			</FileConfiguration>
+		</File>
+		<File 
+			RelativePath="..\matrix_sse2-x86.asm">
+			<FileConfiguration 
+				Name="Debug|Win32">
+				<Tool 
+					Name="GeneralTool"
+					ExcludedFromBuild="1"/>
+			</FileConfiguration>
+			<FileConfiguration 
+				Name="Debug|x64">
+				<Tool 
+					Name="GeneralTool"
+					ExcludedFromBuild="1"/>
+			</FileConfiguration>
+			<FileConfiguration 
+				Name="Release (SSE2)|x64">
+				<Tool 
+					Name="GeneralTool"
+					ExcludedFromBuild="1"/>
+			</FileConfiguration>
+			<FileConfiguration 
+				Name="Release|Win32">
+				<Tool 
+					Name="GeneralTool"
+					ExcludedFromBuild="1"/>
+			</FileConfiguration>
+			<FileConfiguration 
+				Name="Release|x64">
+				<Tool 
+					Name="GeneralTool"
+					ExcludedFromBuild="1"/>
+			</FileConfiguration>
+		</File>
+		<File 
+			RelativePath="..\mc.cpp"/>
+		<File 
+			RelativePath="..\MMU.cpp"/>
+		<File 
+			RelativePath="..\NDSSystem.cpp"/>
+		<File 
+			RelativePath="..\OGLRender.cpp"/>
+		<File 
+			RelativePath="..\readwrite.cpp"/>
+		<File 
+			RelativePath="..\render3D.cpp"/>
+		<File 
+			RelativePath="..\ROMReader.cpp"/>
+		<File 
+			RelativePath="..\saves.cpp"/>
+		<File 
+			RelativePath="..\SPU.cpp"/>
+		<File 
+			RelativePath="..\thumb_instructions.cpp"/>
+		<File 
+			RelativePath="..\wifi.cpp"/>
+		<File 
+			RelativePath=".\AboutBox.cpp"/>
+		<File 
+			RelativePath=".\colorctrl.cpp"/>
+		<File 
+			RelativePath=".\ConfigKeys.cpp"/>
+		<File 
+			RelativePath=".\console.cpp"/>
+		<File 
+			RelativePath=".\CWindow.cpp"/>
+		<File 
+			RelativePath=".\disView.cpp"/>
+		<File 
+			RelativePath=".\FirmConfig.cpp"/>
+		<File 
+			RelativePath=".\fs-windows.cpp"/>
+		<File 
+			RelativePath=".\ginfo.cpp"/>
+		<File 
+			RelativePath=".\IORegView.cpp"/>
+		<File 
+			RelativePath=".\lightView.cpp"/>
+		<File 
+			RelativePath=".\main.cpp"/>
+		<File 
+			RelativePath=".\mapView.cpp"/>
+		<File 
+			RelativePath=".\matrixView.cpp"/>
+		<File 
+			RelativePath=".\memView.cpp"/>
+		<File 
+			RelativePath=".\oamView.cpp"/>
+		<File 
+			RelativePath=".\ogl.cpp"/>
+		<File 
+			RelativePath=".\palView.cpp"/>
+		<File 
+			RelativePath=".\snddx.cpp"/>
+		<File 
+			RelativePath=".\throttle.cpp"/>
+		<File 
+			RelativePath=".\tileView.cpp"/>
+	</Files>
+</VisualStudioProject>
+