- add extended version string;

winport: - add to projects "release" solutions (for developers and beta versions 'Interim') - change about dialog box :)
2009-01-04 11:43:00 +00:00 · 2009-01-04 11:43:00 +00:00 · 6eb058bba3
parent 39083243ed
commit 6eb058bba3
13 changed files with 1152 additions and 1264 deletions
--- a/desmume/AUTHORS
+++ b/desmume/AUTHORS
@ -14,7 +14,7 @@ Ben Jaques (masscat)
 Jeff Bland
 Andres Delikat
 Riccardo Magliocchetti
-Max Tabachenko (CrazyMax/mtabachenko)
+Max Tabachenko (CrazyMax)
 zeromus
 Luigi__
 adelikat
--- a/desmume/src/types.h
+++ b/desmume/src/types.h
@ -21,18 +21,44 @@
 #define TYPES_HPP

 #define DESMUME_NAME "DeSmuME"
+
 #ifdef _WIN64
-#define DESMUME_VERSION_STRING "0.9-interim x64"
+#define DESMUME_PLATFORM_STRING " x64"
 #else
-#define DESMUME_VERSION_STRING "0.9-interim"
+#ifdef _WIN32
+#define DESMUME_PLATFORM_STRING " x86"
+#else
+#define DESMUME_PLATFORM_STRING ""
 #endif
-#define DESMUME_VERSION_NUMERIC 90000
+#endif
+
+#ifdef SSE2
+#define DESMUME_CPUEXT_STRING " SSE2"
+#else
+#define DESMUME_CPUEXT_STRING ""
+#endif
+
+#ifdef DEBUG
+#define DESMUME_SUBVERSION_STRING " debug"
+#else
+#ifdef RELEASE
+#define DESMUME_SUBVERSION_STRING ""
+#else
+#define DESMUME_SUBVERSION_STRING " interim"
+#endif
+#endif
+
 #ifdef __INTEL_COMPILER
-#define DESMUME_NAME_AND_VERSION DESMUME_NAME " " DESMUME_VERSION_STRING " Intel " VERSION
+#define DESMUME_COMPILER " (Intel) "
 #else
-#define DESMUME_NAME_AND_VERSION DESMUME_NAME " " DESMUME_VERSION_STRING " " VERSION
+// TODO: make for others compilers
+#define DESMUME_COMPILER ""
 #endif

+#define DESMUME_VERSION_NUMERIC 90000
+#define DESMUME_VERSION_STRING " " "0.9" DESMUME_PLATFORM_STRING DESMUME_CPUEXT_STRING DESMUME_SUBVERSION_STRING DESMUME_COMPILER
+#define DESMUME_NAME_AND_VERSION " " DESMUME_NAME DESMUME_VERSION_STRING
+
 #ifdef _WIN32
 #define strcasecmp(x,y) _stricmp(x,y)
 #else
@ -70,7 +96,7 @@
 #endif

 #ifndef FORCEINLINE
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 #define FORCEINLINE __forceinline
 #else
 #define FORCEINLINE INLINE
--- a/desmume/src/windows/AboutBox.cpp
+++ b/desmume/src/windows/AboutBox.cpp
@ -24,14 +24,11 @@
 #include "AboutBox.h"
 #include "resource.h"

-#define TEAM	32
-const char	*team[TEAM] = { "Original author",
-							"---------------",
-							"yopyop",
-							"",
-							"Current team",
-							"------------",
-							"Guillaume Duhamel",
+#define ABOUT_TIMER_ID 110222
+#define PER_PAGE_TEAM 23
+#define TEAM 26
+#define SIZE_SCROLL_BUFFER PER_PAGE_TEAM + TEAM
+const char	*team[TEAM] = { "Guillaume Duhamel",
 							"Normmatt",
 							"Bernat Muñoz (shash)",
 							"thoduv",
@ -41,7 +38,7 @@ const char	*team[TEAM] = { "Original author",
 							"Jeff Bland",
 							"Andres Delikat",
 							"Riccardo Magliocchetti",
-							"Max Tabachenko (CrazyMax/mtabachenko)",
+							"Max Tabachenko (CrazyMax)",
 							"zeromus",
 							"Luigi__",
 							"adelikat",
@ -59,6 +56,9 @@ const char	*team[TEAM] = { "Original author",
 							"Theo Berkau"};


+u8	scroll_start;
+u8	scroll_buffer[SIZE_SCROLL_BUFFER][255];
+
 BOOL CALLBACK AboutBox_Proc (HWND dialog, UINT message,WPARAM wparam,LPARAM lparam)
 {
 	switch(message)
@ -67,13 +67,22 @@ BOOL CALLBACK AboutBox_Proc (HWND dialog, UINT message,WPARAM wparam,LPARAM lpar
 		{
 			char buf[2048];
 			memset(buf, 0, sizeof(buf));
+			wsprintf(buf, "version %s", DESMUME_VERSION_STRING);
+			SetDlgItemText(dialog, IDC_TXT_VERSION, buf);
+
+			memset(buf, 0, sizeof(buf));
+			wsprintf(buf, "compiled: %s %s", __DATE__,__TIME__);
+			SetDlgItemText(dialog, IDC_TXT_COMPILED, buf);
+
+			for (int i = 0; i < SIZE_SCROLL_BUFFER; i++)
+				strcpy((char *)scroll_buffer[i], "\n");
 			for (int i = 0; i < TEAM; i++)
 			{
-				strcat(buf,team[i]);
-				strcat(buf,"\n");
+				strcpy((char *)scroll_buffer[i + PER_PAGE_TEAM], team[i]);
+				strcat((char *)scroll_buffer[i + PER_PAGE_TEAM], "\n");
 			}
-
-			SetDlgItemText(dialog, IDC_AUTHORS_LIST, buf);
+			SetTimer(dialog, ABOUT_TIMER_ID, 400, (TIMERPROC) NULL);
+			scroll_start = 0;
 			break;
 		}
 	
@ -81,11 +90,25 @@ BOOL CALLBACK AboutBox_Proc (HWND dialog, UINT message,WPARAM wparam,LPARAM lpar
 		{
 			if((HIWORD(wparam) == BN_CLICKED)&&(((int)LOWORD(wparam)) == IDC_FERMER))
 			{
+				KillTimer(dialog, ABOUT_TIMER_ID);
 				EndDialog(dialog,0);
 				return 1;
 			}
 			break;
 		}
+
+		case WM_TIMER:
+		{
+			char buf[4096];
+			memset(buf, 0, sizeof(buf));
+			for (int i = 0; i < PER_PAGE_TEAM; i++)
+				strcat(buf, (char *)scroll_buffer[i + scroll_start]);
+			scroll_start++;
+			if (scroll_start >= SIZE_SCROLL_BUFFER)
+				scroll_start = 0;
+			SetDlgItemText(dialog, IDC_AUTHORS_LIST, buf);
+			break;
+		}
 	}
 	return 0;
 }
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="shift_jis"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="DeSmuME_VS2005"
 	ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
 	RootNamespace="DeSmuME"
@ -51,7 +51,7 @@
 				EnableFiberSafeOptimizations="false"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;DEBUG\&quot;;WIN32;BETA_VERSION;SPU_INTERPOLATE;HAVE_LIBZ;NOMINMAX"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;HAVE_LIBZ;NOMINMAX"
 				ExceptionHandling="1"
 				BufferSecurityCheck="false"
 				EnableEnhancedInstructionSet="0"
@ -105,7 +105,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Interim|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
 			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
@ -139,7 +139,7 @@
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;Release\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;NDEBUG"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;NDEBUG"
 				StringPooling="true"
 				ExceptionHandling="1"
 				BufferSecurityCheck="false"
@ -193,7 +193,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release (SSE2)|Win32"
+			Name="Interim SSE2|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
 			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
@ -228,7 +228,167 @@
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;Release SSE2\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;NDEBUG"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;NDEBUG"
+				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"
+				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
+				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"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SPU_INTERPOLATE;NOMINMAX;NDEBUG;RELEASE"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+			/>
+			<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"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;NDEBUG;RELEASE"
 				StringPooling="true"
 				ExceptionHandling="1"
 				StructMemberAlignment="0"
@ -386,7 +546,7 @@
 				RelativePath=".\main.cpp"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Interim|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@ -534,7 +694,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Interim|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -543,7 +703,16 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release (SSE2)|Win32"
+						Name="Interim SSE2|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release SSE2 (public)|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@ -581,7 +750,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Interim|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@ -592,7 +761,18 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release (SSE2)|Win32"
+					Name="Interim SSE2|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling..."
+						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"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@ -615,7 +795,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Interim|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@ -836,7 +1016,15 @@
 			RelativePath="..\ROMReader.cpp"
 			>
 			<FileConfiguration
-				Name="Release (SSE2)|Win32"
+				Name="Interim SSE2|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					CallingConvention="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release SSE2 (public)|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@ -860,7 +1048,15 @@
 			RelativePath="..\saves.cpp"
 			>
 			<FileConfiguration
-				Name="Release (SSE2)|Win32"
+				Name="Interim SSE2|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					CallingConvention="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release SSE2 (public)|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@ -11,9 +11,6 @@
 		<Platform
 			Name="Win32"
 		/>
-		<Platform
-			Name="x64"
-		/>
 	</Platforms>
 	<ToolFiles>
 		<DefaultToolFile
@ -55,7 +52,7 @@
 				EnableFiberSafeOptimizations="false"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;DEBUG\&quot;;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
 				ExceptionHandling="1"
 				BufferSecurityCheck="false"
 				EnableEnhancedInstructionSet="0"
@ -106,7 +103,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release (SSE2)|Win32"
+			Name="Interim SSE2|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
 			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
@ -141,7 +138,7 @@
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;SSE2\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
 				StringPooling="true"
 				ExceptionHandling="1"
 				StructMemberAlignment="0"
@ -165,7 +162,7 @@
 			<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 shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
+				OutputFile="$(OutDir)\$(ProjectName)_interim_sse2.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
@ -196,7 +193,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Interim|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
 			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
@ -231,7 +228,7 @@
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
 				StringPooling="true"
 				ExceptionHandling="1"
 				BufferSecurityCheck="false"
@ -251,6 +248,95 @@
 			<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 zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_interim.exe"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
+				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"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SPU_INTERPOLATE;NOMINMAX;RELEASE"
+				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 zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
@ -285,93 +371,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="false"
-				FavorSizeOrSpeed="0"
-				EnableFiberSafeOptimizations="false"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;DEBUG\&quot;;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
-				ExceptionHandling="1"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="0"
-				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.x64\dxguid.lib shell32.lib comdlg32.lib directx.x64\dxerr9.lib directx.x64\dsound.lib directx.x64\dinput8.lib directx.x64\ddraw.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_x64_debug.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<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)|x64"
+			Name="Release SSE2 (public)|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
 			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
@ -395,7 +395,6 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@ -407,11 +406,12 @@
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;SSE2\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE"
 				StringPooling="true"
 				ExceptionHandling="1"
+				StructMemberAlignment="0"
 				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="0"
+				EnableEnhancedInstructionSet="2"
 				FloatingPointModel="2"
 				WarningLevel="1"
 				DebugInformationFormat="3"
@ -429,13 +429,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx.x64\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx.x64\dxerr9.lib directx.x64\dsound.lib directx.x64\dinput8.lib directx.x64\ddraw.lib zlib-2008-x64.lib zziplib-2008-x64.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_x64_sse2.exe"
+				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 shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
 				Profile="false"
 			/>
 			<Tool
@ -461,97 +460,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			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"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
-				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.x64\dxguid.lib shell32.lib comdlg32.lib directx.x64\dxerr9.lib directx.x64\dsound.lib directx.x64\dinput8.lib directx.x64\ddraw.lib zlib-2008-x64.lib zziplib-2008-x64.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_x64.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				GenerateDebugInformation="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-				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>
 	</Configurations>
 	<References>
 	</References>
@ -753,7 +661,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release (SSE2)|Win32"
+							Name="Interim SSE2|Win32"
 							ExcludedFromBuild="true"
 							>
 							<Tool
@ -764,7 +672,29 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
+							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"
 							ExcludedFromBuild="true"
 							>
 							<Tool
@ -785,7 +715,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release (SSE2)|x64"
+							Name="Interim SSE2|x64"
 							>
 							<Tool
 								Name="VCCustomBuildTool"
@ -795,7 +725,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Interim|x64"
 							ExcludedFromBuild="true"
 							>
 							<Tool
@ -805,6 +735,27 @@
 								Outputs="$(IntDir)\$(InputName).obj"
 							/>
 						</FileConfiguration>
+						<FileConfiguration
+							Name="Release (public)|x64"
+							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)|x64"
+							>
+							<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>
 					</File>
 					<File
 						RelativePath="..\matrix_sse2-x86.asm"
@ -818,7 +769,15 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
+							Name="Interim|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="MASM"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release (public)|Win32"
 							ExcludedFromBuild="true"
 							>
 							<Tool
@ -834,7 +793,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release (SSE2)|x64"
+							Name="Interim SSE2|x64"
 							ExcludedFromBuild="true"
 							>
 							<Tool
@ -842,7 +801,23 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Interim|x64"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="MASM"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release (public)|x64"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="MASM"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release SSE2 (public)|x64"
 							ExcludedFromBuild="true"
 							>
 							<Tool
--- a/desmume/src/windows/DeSmuME_Intel.icproj
+++ b/desmume/src/windows/DeSmuME_Intel.icproj
--- a/desmume/src/windows/DeSmuME_Intel.sln
+++ b/desmume/src/windows/DeSmuME_Intel.sln
@ -1,40 +1,35 @@

 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "DeSmuME_Intel", "DeSmuME_Intel.icproj", "{01332293-C619-4B8F-AF74-CA839EE24731}"
+Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "DeSmuME_Intel", "DeSmuME_Intel.icproj", "{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release (SSE2)|Win32 = Release (SSE2)|Win32
-		Release (SSE2)|x64 = Release (SSE2)|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
+		Interim SSE2|Win32 = Interim SSE2|Win32
+		Interim|Win32 = Interim|Win32
+		Release (public)|Win32 = Release (public)|Win32
+		Release SSE2 (public)|Win32 = Release SSE2 (public)|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Debug|Win32.Build.0 = Debug|Win32
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Debug|x64.ActiveCfg = Debug|x64
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Debug|x64.Build.0 = Debug|x64
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Release (SSE2)|Win32.ActiveCfg = Release (SSE2)|Win32
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Release (SSE2)|Win32.Build.0 = Release (SSE2)|Win32
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Release (SSE2)|x64.ActiveCfg = Release (SSE2)|x64
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Release (SSE2)|x64.Build.0 = Release (SSE2)|x64
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Release|Win32.ActiveCfg = Release|Win32
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Release|Win32.Build.0 = Release|Win32
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Release|x64.ActiveCfg = Release|x64
-		{01332293-C619-4B8F-AF74-CA839EE24731}.Release|x64.Build.0 = Release|x64
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.Build.0 = Release|x64
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.ActiveCfg = Release|x64
-		{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}.Release (SSE2)|x64.Build.0 = Release (SSE2)|x64
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release (SSE2)|x64.ActiveCfg = Release (SSE2)|x64
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release (SSE2)|Win32.Build.0 = Release (SSE2)|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release (SSE2)|Win32.ActiveCfg = Release (SSE2)|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.Build.0 = Debug|x64
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.ActiveCfg = Debug|x64
+		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Debug|Win32.Build.0 = Debug|Win32
+		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Interim SSE2|Win32.ActiveCfg = Interim SSE2|Win32
+		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Interim SSE2|Win32.Build.0 = Interim SSE2|Win32
+		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Interim|Win32.ActiveCfg = Interim|Win32
+		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Interim|Win32.Build.0 = Interim|Win32
+		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Release (public)|Win32.ActiveCfg = Release (public)|Win32
+		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Release (public)|Win32.Build.0 = Release (public)|Win32
+		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Release SSE2 (public)|Win32.ActiveCfg = Release SSE2 (public)|Win32
+		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Release SSE2 (public)|Win32.Build.0 = Release SSE2 (public)|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release SSE2 (public)|Win32.Build.0 = Release SSE2 (public)|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release SSE2 (public)|Win32.ActiveCfg = Release SSE2 (public)|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release (public)|Win32.Build.0 = Release (public)|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release (public)|Win32.ActiveCfg = Release (public)|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Interim|Win32.Build.0 = Interim|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Interim|Win32.ActiveCfg = Interim|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Interim SSE2|Win32.Build.0 = Interim SSE2|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Interim SSE2|Win32.ActiveCfg = Interim SSE2|Win32
 		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.Build.0 = Debug|Win32
 		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.ActiveCfg = Debug|Win32
 	EndGlobalSection
--- a/desmume/src/windows/DeSmuME_Intel.vcproj
+++ b/desmume/src/windows/DeSmuME_Intel.vcproj
@ -11,9 +11,6 @@
 		<Platform
 			Name="Win32"
 		/>
-		<Platform
-			Name="x64"
-		/>
 	</Platforms>
 	<ToolFiles>
 		<DefaultToolFile
@ -24,7 +21,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@ -55,7 +52,7 @@
 				EnableFiberSafeOptimizations="false"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;DEBUG\&quot;;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
 				ExceptionHandling="1"
 				BufferSecurityCheck="false"
 				EnableEnhancedInstructionSet="0"
@ -106,95 +103,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Interim SSE2|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="false"
-				FavorSizeOrSpeed="0"
-				EnableFiberSafeOptimizations="false"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;DEBUG\&quot;;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
-				ExceptionHandling="1"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="0"
-				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.x64\dxguid.lib shell32.lib comdlg32.lib directx.x64\dxerr9.lib directx.x64\dsound.lib directx.x64\dinput8.lib directx.x64\ddraw.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_x64_debug.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<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)|Win32"
-			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			WholeProgramOptimization="1"
@ -227,7 +138,7 @@
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;SSE2\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
 				StringPooling="true"
 				ExceptionHandling="1"
 				StructMemberAlignment="0"
@ -251,7 +162,7 @@
 			<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 shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
+				OutputFile="$(OutDir)\$(ProjectName)_interim_sse2.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
@ -282,9 +193,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release (SSE2)|x64"
+			Name="Interim|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			WholeProgramOptimization="1"
@ -306,7 +217,6 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@ -318,7 +228,7 @@
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;SSE2\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
 				StringPooling="true"
 				ExceptionHandling="1"
 				BufferSecurityCheck="false"
@ -340,14 +250,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx.x64\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx.x64\dxerr9.lib directx.x64\dsound.lib directx.x64\dinput8.lib directx.x64\ddraw.lib zlib-2008-x64.lib zziplib-2008-x64.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_x64_sse2.exe"
+				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 zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_interim.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
-				Profile="false"
+				Profile="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -373,9 +282,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Release (public)|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			WholeProgramOptimization="1"
@ -408,7 +317,7 @@
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SPU_INTERPOLATE;NOMINMAX;RELEASE"
 				StringPooling="true"
 				ExceptionHandling="1"
 				BufferSecurityCheck="false"
@ -462,9 +371,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
+			Name="Release SSE2 (public)|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			WholeProgramOptimization="1"
@ -486,7 +395,6 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@ -498,11 +406,12 @@
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;VERSION=\&quot;\&quot;;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE"
 				StringPooling="true"
 				ExceptionHandling="1"
+				StructMemberAlignment="0"
 				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="0"
+				EnableEnhancedInstructionSet="2"
 				FloatingPointModel="2"
 				WarningLevel="1"
 				DebugInformationFormat="3"
@ -520,14 +429,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx.x64\dxguid.lib shell32.lib comdlg32.lib directx.x64\dxerr9.lib directx.x64\dsound.lib directx.x64\dinput8.lib directx.x64\ddraw.lib zlib-2008-x64.lib zziplib-2008-x64.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_x64.exe"
+				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 shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
-				Profile="true"
+				Profile="false"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -752,6 +660,50 @@
 								CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							/>
 						</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"
+							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="Debug|x64"
 							ExcludedFromBuild="true"
@ -763,7 +715,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release (SSE2)|Win32"
+							Name="Interim SSE2|x64"
+							>
+							<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|x64"
 							ExcludedFromBuild="true"
 							>
 							<Tool
@ -774,17 +736,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release (SSE2)|x64"
-							>
-							<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|Win32"
+							Name="Release (public)|x64"
 							ExcludedFromBuild="true"
 							>
 							<Tool
@ -795,8 +747,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
-							ExcludedFromBuild="true"
+							Name="Release SSE2 (public)|x64"
 							>
 							<Tool
 								Name="VCCustomBuildTool"
@ -817,6 +768,22 @@
 								Name="MASM"
 							/>
 						</FileConfiguration>
+						<FileConfiguration
+							Name="Interim|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="MASM"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release (public)|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="MASM"
+							/>
+						</FileConfiguration>
 						<FileConfiguration
 							Name="Debug|x64"
 							ExcludedFromBuild="true"
@ -826,7 +793,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release (SSE2)|x64"
+							Name="Interim SSE2|x64"
 							ExcludedFromBuild="true"
 							>
 							<Tool
@ -834,7 +801,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
+							Name="Interim|x64"
 							ExcludedFromBuild="true"
 							>
 							<Tool
@ -842,7 +809,15 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Release (public)|x64"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="MASM"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release SSE2 (public)|x64"
 							ExcludedFromBuild="true"
 							>
 							<Tool
--- a/desmume/src/windows/aviout.cpp
+++ b/desmume/src/windows/aviout.cpp
@ -7,6 +7,8 @@
 #include <vfw.h>
 #include <stdio.h>

+#include "debug.h"
+
 void EMU_PrintError(const char* msg) {
 	LOG(msg);
 }
--- a/desmume/src/windows/console.h
+++ b/desmume/src/windows/console.h
@ -22,6 +22,9 @@
 */
 #ifndef _CONSOLE_H_
 #define _CONSOLE_H_
+
+#ifdef BETA_VERSION
+
 #include "../common.h"
 #include <stdio.h>
 #include "debug.h"
@ -29,4 +32,12 @@
 void OpenConsole();
 void CloseConsole();

+#else
+
+#define OpenConsole()
+#define CloseConsole()
+#define pringlog(...)
+
+#endif
+
 #endif
--- a/desmume/src/windows/ogl.cpp
+++ b/desmume/src/windows/ogl.cpp
@ -1,5 +1,6 @@
 #define WIN32_LEAN_AND_MEAN
 #include "../common.h"
+#include "../debug.h"
 #include <gl/gl.h>
 #include <gl/glext.h>
 #include "console.h"
@ -66,9 +67,9 @@ bool windows_opengl_init()

 	res=CheckHardwareSupport(oglDC);
 	if (res>=0&&res<=2) 
-			LOG("OpenGL mode: %s\n",opengl_modes[res]); 
+			INFO("OpenGL mode: %s\n",opengl_modes[res]); 
 		else 
-			LOG("OpenGL mode: uknown\n");
+			INFO("OpenGL mode: uknown\n");

 	oglAlreadyInit = true;

--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@ -1,5 +1,5 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
 // Used by resources.rc
 //
 #define IDM_OPEN                        101
@ -216,7 +216,10 @@
 #define IDC_DISPSTATB9                  1028
 #define IDC_3DCORE                      1028
 #define IDC_IME9                        1029
+#define IDC_TXT_COMPILED                1029
 #define IDC_GXSTAT9                     1030
+#define IDC_TXT_VERSION                 1030
+#define IDC_SCROLLBAR1                  1031
 #define IDC_IE7                         1032
 #define IDC_IF7                         1033
 #define IDC_IME7                        1034
@ -373,7 +376,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        113
 #define _APS_NEXT_COMMAND_VALUE         40041
-#define _APS_NEXT_CONTROL_VALUE         1029
+#define _APS_NEXT_CONTROL_VALUE         1032
 #define _APS_NEXT_SYMED_VALUE           112
 #endif
 #endif
--- a/desmume/src/windows/resources.rc
+++ b/desmume/src/windows/resources.rc
@ -17,7 +17,7 @@
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
 #ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
+#pragma code_page(1251)
 #endif //_WIN32

 /////////////////////////////////////////////////////////////////////////////
@ -1340,8 +1340,14 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTI
 CAPTION "About DeSmuME..."
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
+    CTEXT           "",IDC_AUTHORS_LIST,7,75,198,188,0,WS_EX_CLIENTEDGE
    DEFPUSHBUTTON   "Close",IDC_FERMER,86,277,50,14
-    CTEXT           "",IDC_AUTHORS_LIST,7,7,198,264,0,WS_EX_CLIENTEDGE
+    CTEXT           "DeSmuME",IDC_STATIC,7,7,198,10
+    CTEXT           "version",IDC_TXT_VERSION,7,18,198,8
+    RTEXT           "compiled",IDC_TXT_COMPILED,7,265,198,8
+    CTEXT           "Original author",IDC_STATIC,7,36,198,10
+    CTEXT           "yopyop",IDC_STATIC,9,45,196,10
+    CTEXT           "current team",IDC_STATIC,8,63,198,10
 END

 IDD_INPUT DIALOGEX 0, 0, 325, 148