From 62334ef6c00db6e3e72b9ad9eb6595ff9abb8d20 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Thu, 16 Apr 2009 08:43:57 +0000
Subject: [PATCH] win32: add a configuration system. remove excess build
 configurations, which were getting hard to manage. to configure your build
 (such as to enable SSE2), check out the example in the defaultconfig
 directory. this is a bit strange. please evaluate it.

---
 desmume/src/matrix.h                          |  27 +-
 desmume/src/matrix_sse2-x86.asm               |  20 +-
 desmume/src/types.h                           |  24 +-
 desmume/src/windows/DeSmuME_2005.vcproj       | 377 ++----------------
 desmume/src/windows/DeSmuME_2008.vcproj       | 339 +---------------
 desmume/src/windows/config.h                  |   6 +
 .../src/windows/defaultconfig/userconfig.h    |  12 +
 7 files changed, 106 insertions(+), 699 deletions(-)
 create mode 100644 desmume/src/windows/config.h
 create mode 100644 desmume/src/windows/defaultconfig/userconfig.h

diff --git a/desmume/src/matrix.h b/desmume/src/matrix.h
index 13afc4da9..54b7143d9 100644
--- a/desmume/src/matrix.h
+++ b/desmume/src/matrix.h
@@ -41,11 +41,28 @@ void	MatrixInit				(float *matrix);
 #define MATRIXFASTCALL
 #endif
 
-void	MATRIXFASTCALL MatrixMultVec3x3		(const float * matrix, float * vecPtr);
-void	MATRIXFASTCALL MatrixMultVec4x4		(const float * matrix, float * vecPtr);
-void	MATRIXFASTCALL MatrixMultiply		(float * matrix, const float * rightMatrix);
-void	MATRIXFASTCALL MatrixTranslate		(float *matrix, const float *ptr);
-void	MATRIXFASTCALL MatrixScale			(float * matrix, const float * ptr);
+//In order to conditionally use these asm optimized functions in visual studio
+//without having to make new build types to exclude the assembly files.
+//a bit sloppy, but there aint much to it
+#ifdef SSE2
+#define SSE2_FUNC(X) _sse2_##X
+#define MatrixMultVec4x4 _sse2_MatrixMultVec4x4
+#define MatrixMultVec3x3 _sse2_MatrixMultVec3x3
+#define MatrixMultiply _sse2_MatrixMultiply
+#define MatrixTranslate _sse2_MatrixTranslate
+#define MatrixScale _sse2_MatrixScale
+#else
+#define SSE2_FUNC(X) X
+#endif
+
+void	MATRIXFASTCALL SSE2_FUNC(MatrixMultVec3x3)		(const float * matrix, float * vecPtr);
+void	MATRIXFASTCALL SSE2_FUNC(MatrixMultVec4x4)		(const float * matrix, float * vecPtr);
+void	MATRIXFASTCALL SSE2_FUNC(MatrixMultiply)		(float * matrix, const float * rightMatrix);
+void	MATRIXFASTCALL SSE2_FUNC(MatrixTranslate)		(float *matrix, const float *ptr);
+void	MATRIXFASTCALL SSE2_FUNC(MatrixScale)			(float * matrix, const float * ptr);
+
+
+
 float	MATRIXFASTCALL MatrixGetMultipliedIndex	(int index, float *matrix, float *rightMatrix);
 void	MATRIXFASTCALL MatrixSet				(float *matrix, int x, int y, float value);
 void	MATRIXFASTCALL MatrixCopy				(float * matrixDST, const float * matrixSRC);
diff --git a/desmume/src/matrix_sse2-x86.asm b/desmume/src/matrix_sse2-x86.asm
index 067881592..668e488c1 100644
--- a/desmume/src/matrix_sse2-x86.asm
+++ b/desmume/src/matrix_sse2-x86.asm
@@ -24,7 +24,7 @@
 	.model	flat
 	.code
 	
-@MatrixMultVec4x4@8 PROC PUBLIC
+@_sse2_MatrixMultVec4x4@8 PROC PUBLIC
 		movaps	xmm0, XMMWORD PTR [ecx]
 		movaps	xmm1, XMMWORD PTR [ecx+16]
 		movaps	xmm2, XMMWORD PTR [ecx+32]
@@ -46,9 +46,9 @@
 		addps	xmm4, xmm7
 		movaps	XMMWORD PTR [edx], xmm4
 		ret		0
-@MatrixMultVec4x4@8 ENDP
+@_sse2_MatrixMultVec4x4@8 ENDP
 
-@MatrixMultVec3x3@8 PROC PUBLIC
+@_sse2_MatrixMultVec3x3@8 PROC PUBLIC
 		movaps	xmm0, XMMWORD PTR [ecx]
 		movaps	xmm1, XMMWORD PTR [ecx+16]
 		movaps	xmm2, XMMWORD PTR [ecx+32]
@@ -66,9 +66,9 @@
 		addps	xmm4, xmm6
 		movaps	XMMWORD PTR [edx], xmm4
 		ret		0
-@MatrixMultVec3x3@8 ENDP
+@_sse2_MatrixMultVec3x3@8 ENDP
 
-@MatrixMultiply@8 PROC PUBLIC
+@_sse2_MatrixMultiply@8 PROC PUBLIC
 		movaps	xmm0, XMMWORD PTR [ecx]
 		movaps	xmm1, XMMWORD PTR [ecx+16]
 		movaps	xmm2, XMMWORD PTR [ecx+32]
@@ -138,9 +138,9 @@
 		addps	xmm4,xmm7
 		movaps	XMMWORD PTR [ecx+48],xmm4
 		ret		0
-@MatrixMultiply@8 ENDP
+@_sse2_MatrixMultiply@8 ENDP
 
-@MatrixTranslate@8 PROC PUBLIC
+@_sse2_MatrixTranslate@8 PROC PUBLIC
 		movaps	xmm0, XMMWORD PTR [ecx]
 		movaps	xmm1, XMMWORD PTR [ecx+16]
 		movaps	xmm2, XMMWORD PTR [ecx+32]
@@ -160,9 +160,9 @@
 		addps	xmm4, xmm3
 		movaps	XMMWORD PTR [ecx+48], xmm4
 		ret		0
-@MatrixTranslate@8 ENDP
+@_sse2_MatrixTranslate@8 ENDP
 
-@MatrixScale@8 PROC PUBLIC
+@_sse2_MatrixScale@8 PROC PUBLIC
 		movaps	xmm0, XMMWORD PTR [ecx]
 		movaps	xmm1, XMMWORD PTR [ecx+16]
 		movaps	xmm2, XMMWORD PTR [ecx+32]
@@ -179,7 +179,7 @@
 		movaps	XMMWORD PTR [ecx+16],xmm5
 		movaps	XMMWORD PTR [ecx+32],xmm6
 		ret		0
-@MatrixScale@8 ENDP
+@_sse2_MatrixScale@8 ENDP
 
 end
 
diff --git a/desmume/src/types.h b/desmume/src/types.h
index ea9c82eeb..3f193ab30 100644
--- a/desmume/src/types.h
+++ b/desmume/src/types.h
@@ -20,10 +20,10 @@
 #ifndef TYPES_HPP
 #define TYPES_HPP
 
-//--------------
-//configuration
-#define DEVELOPER
-//--------------
+//todo - everyone will want to support this eventually, i suppose
+#ifdef _MSC_VER
+#include "config.h"
+#endif
 
 #define DESMUME_NAME "DeSmuME"
 
@@ -43,20 +43,18 @@
 #define DESMUME_CPUEXT_STRING ""
 #endif
 
-//#ifdef DEVELOPER
-//#define DESMUME_FEATURE_STRING " dev+"
-//#else
+#ifdef DEVELOPER
+#define DESMUME_FEATURE_STRING " dev+"
+#else
 #define DESMUME_FEATURE_STRING ""
-//#endif
+#endif
 
 #ifdef DEBUG
 #define DESMUME_SUBVERSION_STRING " debug"
-#else
-#ifdef RELEASE
+#elif defined(PUBLIC_RELEASE)
 #define DESMUME_SUBVERSION_STRING ""
 #else
-#define DESMUME_SUBVERSION_STRING " prerelease"
-#endif
+#define DESMUME_SUBVERSION_STRING " svn"
 #endif
 
 #ifdef __INTEL_COMPILER
@@ -76,7 +74,7 @@
 #endif
 
 #define DESMUME_VERSION_NUMERIC 90300
-#define DESMUME_VERSION_STRING " " "0.9.3 svn" DESMUME_FEATURE_STRING DESMUME_PLATFORM_STRING DESMUME_CPUEXT_STRING DESMUME_SUBVERSION_STRING DESMUME_COMPILER
+#define DESMUME_VERSION_STRING " " "0.9.3" DESMUME_SUBVERSION_STRING DESMUME_FEATURE_STRING DESMUME_PLATFORM_STRING DESMUME_CPUEXT_STRING DESMUME_COMPILER
 #define DESMUME_NAME_AND_VERSION " " DESMUME_NAME DESMUME_VERSION_STRING
 
 #ifdef _WIN32
diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index 822cf0241..5491fa8c3 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -50,8 +50,8 @@
 				FavorSizeOrSpeed="0"
 				EnableFiberSafeOptimizations="false"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;HAVE_LIBZ;HAVE_LIBZZIP;NOMINMAX;DEBUG;WANTPROGINFO;EXPERIMENTAL_WIFI"
+				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;SPU_INTERPOLATE;HAVE_LIBZ;HAVE_LIBZZIP;NOMINMAX;DEBUG;EXPERIMENTAL_WIFI"
 				ExceptionHandling="1"
 				BufferSecurityCheck="false"
 				EnableEnhancedInstructionSet="0"
@@ -107,96 +107,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Interim|Win32"
-			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;NDEBUG;EXPERIMENTAL_WIFI"
-				StringPooling="true"
-				ExceptionHandling="1"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="0"
-				FloatingPointModel="2"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="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"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				DelayLoadDLLs="wpcap.dll"
-				GenerateDebugInformation="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="DeSmuME_x86.manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Interim SSE2|Win32"
+			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
 			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
@@ -230,173 +141,8 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;NDEBUG;EXPERIMENTAL_WIFI"
-				StringPooling="true"
-				ExceptionHandling="1"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				EnableEnhancedInstructionSet="2"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="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"
-				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				DelayLoadDLLs="wpcap.dll"
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				EnableCOMDATFolding="0"
-				OptimizeForWindows98="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="DeSmuME_x86.manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (public)|Win32"
-			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap"
+				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SPU_INTERPOLATE;NOMINMAX;NDEBUG;RELEASE;EXPERIMENTAL_WIFI"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="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"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				DelayLoadDLLs="wpcap.dll"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release SSE2 (public)|Win32"
-			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;NDEBUG;RELEASE;EXPERIMENTAL_WIFI"
 				StringPooling="true"
 				ExceptionHandling="1"
 				StructMemberAlignment="0"
@@ -475,6 +221,10 @@
 				RelativePath=".\aviout.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\buildconfig.h"
+				>
+			</File>
 			<File
 				RelativePath=".\cheatsWin.cpp"
 				>
@@ -491,6 +241,10 @@
 				RelativePath=".\colorctrl.h"
 				>
 			</File>
+			<File
+				RelativePath=".\config.h"
+				>
+			</File>
 			<File
 				RelativePath=".\console.cpp"
 				>
@@ -586,14 +340,6 @@
 			<File
 				RelativePath=".\main.cpp"
 				>
-				<FileConfiguration
-					Name="Interim|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\main.h"
@@ -679,6 +425,14 @@
 				RelativePath=".\tileView.h"
 				>
 			</File>
+			<Filter
+				Name="userconfig"
+				>
+				<File
+					RelativePath=".\userconfig\userconfig.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="utils"
@@ -743,25 +497,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Interim|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Interim SSE2|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release SSE2 (public)|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -799,31 +535,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Interim|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Interim SSE2|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (public)|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release SSE2 (public)|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -836,23 +548,6 @@
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Interim|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (public)|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="MASM"
@@ -911,6 +606,14 @@
 		<File
 			RelativePath="..\bios.cpp"
 			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					GeneratePreprocessedFile="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\bios.h"
@@ -1128,15 +831,7 @@
 			RelativePath="..\ROMReader.cpp"
 			>
 			<FileConfiguration
-				Name="Interim SSE2|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					CallingConvention="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release SSE2 (public)|Win32"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -1160,15 +855,7 @@
 			RelativePath="..\saves.cpp"
 			>
 			<FileConfiguration
-				Name="Interim SSE2|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					CallingConvention="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release SSE2 (public)|Win32"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index d0f3c12e2..980d52bc4 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -51,7 +51,7 @@
 				FavorSizeOrSpeed="0"
 				EnableFiberSafeOptimizations="false"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap"
+				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI"
 				ExceptionHandling="1"
 				BufferSecurityCheck="false"
@@ -105,7 +105,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Interim SSE2|Win32"
+			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
 			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
@@ -139,279 +139,8 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI"
-				StringPooling="true"
-				ExceptionHandling="1"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="2"
-				FloatingPointModel="2"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="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)_interim_sse2.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib;.\winpcap"
-				DelayLoadDLLs="wpcap.dll"
-				GenerateDebugInformation="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				Profile="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="DeSmuME_x86.manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Interim|Win32"
-			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI"
-				StringPooling="true"
-				ExceptionHandling="1"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="2"
-				FloatingPointModel="2"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="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)_interim.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib;.\winpcap"
-				DelayLoadDLLs="wpcap.dll"
-				GenerateDebugInformation="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				Profile="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="DeSmuME_x86.manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (public)|Win32"
-			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI"
-				StringPooling="true"
-				ExceptionHandling="1"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="0"
-				FloatingPointModel="2"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="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).exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib;.\winpcap"
-				DelayLoadDLLs="wpcap.dll"
-				GenerateDebugInformation="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				Profile="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="DeSmuME_x86.manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release SSE2 (public)|Win32"
-			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI"
+				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG"
 				StringPooling="true"
 				ExceptionHandling="1"
 				StructMemberAlignment="0"
@@ -687,40 +416,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Interim SSE2|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling x64..."
-								CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="$(IntDir)\$(InputName).obj"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Interim|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling x64..."
-								CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="$(IntDir)\$(InputName).obj"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release (public)|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling x64..."
-								CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="$(IntDir)\$(InputName).obj"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release SSE2 (public)|Win32"
+							Name="Release|Win32"
 							ExcludedFromBuild="true"
 							>
 							<Tool
@@ -788,23 +484,6 @@
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="MASM"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Interim|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="MASM"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release (public)|Win32"
-							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="MASM"
@@ -1090,6 +769,14 @@
 					RelativePath=".\tileView.h"
 					>
 				</File>
+				<Filter
+					Name="userconfig"
+					>
+					<File
+						RelativePath=".\userconfig\userconfig.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="core"
diff --git a/desmume/src/windows/config.h b/desmume/src/windows/config.h
new file mode 100644
index 000000000..fc3646704
--- /dev/null
+++ b/desmume/src/windows/config.h
@@ -0,0 +1,6 @@
+#ifndef _CONFIG_H
+#define _CONFIG_H
+
+#include "userconfig.h"
+
+#endif
diff --git a/desmume/src/windows/defaultconfig/userconfig.h b/desmume/src/windows/defaultconfig/userconfig.h
new file mode 100644
index 000000000..b87faebb4
--- /dev/null
+++ b/desmume/src/windows/defaultconfig/userconfig.h
@@ -0,0 +1,12 @@
+#ifndef _USERCONFIG_H
+#define _USERCONFIG_H
+
+//this is a default file. it should not be edited, or else you will mess up the defaults.
+//to customize your build, place a customized copy in the userconfig directory
+//(alongside this defaultconfig directory)
+
+//#define SSE2
+//#define DEVELOPER
+
+
+#endif //_USERCONFIG_H