From 46430f98fa97c6d9d385a6d1a765a9a46e5721dc Mon Sep 17 00:00:00 2001
From: spacy51 <spacy51@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Wed, 13 Aug 2008 10:01:39 +0000
Subject: [PATCH] REMOVED outdated VC2005 project files REMOVED libpng source
 code REMOVED zlib source code RENAMED vc2008 to vc2008_qt MOVED Win32/MFC
 project files to 'project/vc2008_mfc' folder CHANGED XAudio2 to default sound
 output

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@596 a31d4220-a93d-0410-bf67-fe4944624d44
---
 VBA.sln                                       |   63 -
 VBA.vcproj                                    | 1967 -----------
 doc/DevInfo.txt                               |   20 +-
 lang/how-to.txt                               |    2 +-
 VBA2008.sln => project/vc2008_mfc/VBA2008.sln |   56 +-
 .../vc2008_mfc/VBA2008.vcproj                 | 2998 ++++++++---------
 nasm.rules => project/vc2008_mfc/nasm.rules   |    0
 project/{vc2008 => vc2008_qt}/vba-m.sln       |    0
 project/{vc2008 => vc2008_qt}/vba-m.vcproj    |    0
 src/win32/VBA.cpp                             |    9 +-
 src/win32/XAudio2_Config.cpp                  |    7 +-
 11 files changed, 1550 insertions(+), 3572 deletions(-)
 delete mode 100644 VBA.sln
 delete mode 100644 VBA.vcproj
 rename VBA2008.sln => project/vc2008_mfc/VBA2008.sln (90%)
 rename VBA2008.vcproj => project/vc2008_mfc/VBA2008.vcproj (56%)
 rename nasm.rules => project/vc2008_mfc/nasm.rules (100%)
 rename project/{vc2008 => vc2008_qt}/vba-m.sln (100%)
 rename project/{vc2008 => vc2008_qt}/vba-m.vcproj (100%)

diff --git a/VBA.sln b/VBA.sln
deleted file mode 100644
index f8cae2b3..00000000
--- a/VBA.sln
+++ /dev/null
@@ -1,63 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance", "VBA.vcproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092} = {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {7AEC599C-7C82-4F00-AA60-411E0A359CB0}
-		{B1BB4620-E672-4D6B-AF90-08161EB18D4F} = {B1BB4620-E672-4D6B-AF90-08161EB18D4F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\dependencies\zlib\zlib.vcproj", "{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\dependencies\libpng\libpng.vcproj", "{B1BB4620-E672-4D6B-AF90-08161EB18D4F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092} = {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\dependencies\File_Extractor-0.4.3\File_Extractor.vcproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.Build.0 = Debug|Win32
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|x64.ActiveCfg = Debug|x64
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|x64.Build.0 = Debug|x64
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.ActiveCfg = Release|Win32
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.Build.0 = Release|Win32
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|x64.ActiveCfg = Release|x64
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|x64.Build.0 = Release|x64
-		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|Win32.Build.0 = Debug|Win32
-		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|x64.ActiveCfg = Debug|x64
-		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|x64.Build.0 = Debug|x64
-		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|Win32.ActiveCfg = Release|Win32
-		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|Win32.Build.0 = Release|Win32
-		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|x64.ActiveCfg = Release|x64
-		{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|x64.Build.0 = Release|x64
-		{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Debug|Win32.Build.0 = Debug|Win32
-		{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Debug|x64.ActiveCfg = Debug|x64
-		{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Debug|x64.Build.0 = Debug|x64
-		{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Release|Win32.ActiveCfg = Release|Win32
-		{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Release|Win32.Build.0 = Release|Win32
-		{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Release|x64.ActiveCfg = Release|x64
-		{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Release|x64.Build.0 = Release|x64
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|x64.ActiveCfg = Debug|x64
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|x64.Build.0 = Debug|x64
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|x64.ActiveCfg = Release|x64
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/VBA.vcproj b/VBA.vcproj
deleted file mode 100644
index 08c8d47c..00000000
--- a/VBA.vcproj
+++ /dev/null
@@ -1,1967 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="VisualBoyAdvance"
-	ProjectGUID="{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
-	RootNamespace="VBA"
-	Keyword="MFCProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<DefaultToolFile
-			FileName="masm.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)_temp"
-			ConfigurationType="1"
-			UseOfMFC="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng\src;&quot;..\dependencies\File_Extractor-0.4.3\fex&quot;;..\dependencies\msvc"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;MMX;BKPT_SUPPORT;GBA_LOGGING"
-				StringPooling="false"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="1"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				EnableEnhancedInstructionSet="0"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="nafxcwd.lib LIBCMTD.lib dinput8.lib dxguid.lib winmm.lib Dsound.lib"
-				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
-				Version=""
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				GenerateManifest="true"
-				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;x86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
-				IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)_temp"
-			ConfigurationType="1"
-			UseOfMFC="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng\src;&quot;..\dependencies\File_Extractor-0.4.3\fex&quot;;..\dependencies\msvc"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;BKPT_SUPPORT;GBA_LOGGING;C_CORE;NO_ASM"
-				StringPooling="false"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="1"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				EnableEnhancedInstructionSet="0"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="nafxcwd.lib LIBCMTD.lib dinput8.lib dxguid.lib winmm.lib Dsound.lib"
-				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
-				Version=""
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				GenerateManifest="true"
-				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;amd64&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
-				IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)_temp"
-			ConfigurationType="1"
-			UseOfMFC="1"
-			UseOfATL="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D_ST_MODEL&#x0D;&#x0A;/D_SECURE_SCL=0&#x0D;&#x0A;/Zc:forScope-&#x0D;&#x0A;/MP"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				FavorSizeOrSpeed="1"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng\src;&quot;..\dependencies\File_Extractor-0.4.3\fex&quot;;..\dependencies\msvc"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;MMX;BKPT_SUPPORT;GBA_LOGGING;FINAL_VERSION"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="1"
-				FloatingPointModel="2"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG "
-				Culture="1033"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="false"
-				IgnoreImportLibrary="false"
-				AdditionalDependencies="nafxcw.lib LIBCMT.lib dinput8.lib winmm.lib dxguid.lib Dsound.lib"
-				ShowProgress="0"
-				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
-				Version=""
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateManifest="true"
-				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;x86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
-				GenerateDebugInformation="false"
-				AssemblyDebug="2"
-				GenerateMapFile="false"
-				MapExports="false"
-				SubSystem="2"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				OptimizeForWindows98="1"
-				LinkTimeCodeGeneration="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-				ExcludedFromBuild="true"
-				RelativePath=""
-				UnloadBeforeCopy="false"
-				RegisterOutput="false"
-				VirtualDirectoryName=""
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)_temp"
-			ConfigurationType="1"
-			UseOfMFC="1"
-			UseOfATL="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D_ST_MODEL&#x0D;&#x0A;/D_SECURE_SCL=0&#x0D;&#x0A;/Zc:forScope-&#x0D;&#x0A;/MP"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				FavorSizeOrSpeed="1"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng\src;&quot;..\dependencies\File_Extractor-0.4.3\fex&quot;;..\dependencies\msvc"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;BKPT_SUPPORT;GBA_LOGGING;FINAL_VERSION;C_CORE;NO_ASM"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="0"
-				FloatingPointModel="2"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="false"
-				IgnoreImportLibrary="false"
-				AdditionalDependencies="nafxcw.lib LIBCMT.lib dinput8.lib winmm.lib dxguid.lib Dsound.lib"
-				ShowProgress="0"
-				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
-				Version=""
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateManifest="true"
-				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;amd64&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
-				GenerateDebugInformation="false"
-				AssemblyDebug="2"
-				GenerateMapFile="false"
-				MapExports="false"
-				SubSystem="2"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				OptimizeForWindows98="1"
-				LinkTimeCodeGeneration="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-				ExcludedFromBuild="true"
-				RelativePath=""
-				UnloadBeforeCopy="false"
-				RegisterOutput="false"
-				VirtualDirectoryName=""
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="source"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="Filters"
-				>
-				<File
-					RelativePath=".\src\2xSaI.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WholeProgramOptimization="true"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WholeProgramOptimization="true"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\2xSaImmx.asm"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -d__DJGPP__ -O1 -fwin32 -g -Xvc -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -d__DJGPP__ -O1 -fwin64 -g -Xvc -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -d__DJGPP__ -O1 -fwin32 -Xvc -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -d__DJGPP__ -O1 -fwin64 -Xvc -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\admame.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bilinear.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\interframe.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pixel.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\rpi.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\scanline.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\simpleFilter.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Functionality"
-				>
-				<File
-					RelativePath=".\src\armdis.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\CheatSearch.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gbafilter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\memgzio.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="1"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="1"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\win32\Reg.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Util.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="GBA"
-				>
-				<File
-					RelativePath=".\src\agb\agbprint.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bios.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Cheats.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\EEprom.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\elf.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Flash.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gba-arm.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gba-thumb.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gba.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gbagfx.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Globals.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode0.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode1.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode2.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode3.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode4.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode5.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\remote.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\RTC.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Sound.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Sram.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="GB"
-				>
-				<File
-					RelativePath=".\src\dmg\gb.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbCheats.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbDis.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbGfx.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbGlobals.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbMemory.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbPrinter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbSGB.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbSound.cpp"
-					>
-				</File>
-				<Filter
-					Name="GB APU"
-					>
-					<File
-						RelativePath=".\src\dmg\gb_apu\Blip_Buffer.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\Effects_Buffer.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\Gb_Apu.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\Gb_Apu_State.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\Gb_Oscs.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\Multi_Buffer.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="UI"
-				>
-				<File
-					RelativePath=".\src\win32\AboutDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AccelEditor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AcceleratorManager.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Associate.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AVIWrite.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\BIOSDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\BitmapControl.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\CmdAccelOb.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ColorButton.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ColorControl.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Commands.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Directories.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Disassemble.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ExportGSASnapshot.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\FileDlg.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\FullscreenSettings.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GameOverrides.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GBACheats.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GDBConnection.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GSACodeSelect.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Hyperlink.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\IOViewer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Joypad.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\KeyboardEdit.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\LangSelect.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Logging.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MapView.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MaxScale.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewerAddressSize.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewerDlg.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OALConfig.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OamView.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\PaletteView.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\PaletteViewControl.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ResizeDlg.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\RewindInterval.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\RomInfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\SelectPlugin.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\StringTokenizer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Throttle.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\TileView.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\WavWriter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\WinResUtil.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ZoomControl.cpp"
-					>
-				</File>
-				<Filter
-					Name="GB"
-					>
-					<File
-						RelativePath=".\src\win32\GBCheatsDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBColorDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBDisassemble.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBMapView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBMemoryViewerDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBOamView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBPaletteView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBPrinterDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBTileView.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="MainWnd"
-					>
-					<File
-						RelativePath=".\src\win32\MainWnd.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\MainWndCheats.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\MainWndFile.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\MainWndHelp.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\MainWndOptions.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\MainWndTools.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="Main"
-				>
-				<File
-					RelativePath=".\src\win32\stdafx.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\VBA-M.ico"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\VBA.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\VBA.rc"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="IO"
-				>
-				<File
-					RelativePath=".\src\win32\Direct3D.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\DirectInput.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\DirectSound.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\glfont.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="1"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="1"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="1"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="1"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\win32\LoadOAL.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OpenAL.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OpenGL.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Linking"
-				>
-				<File
-					RelativePath=".\src\agb\gbalink.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gbalink.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\LinkOptions.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\LinkOptions.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="header"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<Filter
-				Name="GB"
-				>
-				<File
-					RelativePath=".\src\dmg\gb.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbCheats.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbCodes.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbCodesCB.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbGlobals.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbMemory.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbPrinter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbSGB.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbSound.h"
-					>
-				</File>
-				<Filter
-					Name="GB APU"
-					>
-					<File
-						RelativePath=".\src\dmg\gb_apu\blargg_common.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\blargg_config.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\blargg_source.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\Blip_Buffer.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\Effects_Buffer.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\Gb_Apu.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\Gb_Oscs.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\dmg\gb_apu\Multi_Buffer.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="Filters"
-				>
-				<File
-					RelativePath=".\src\win32\rpi.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="GBA"
-				>
-				<File
-					RelativePath=".\src\agb\agbprint.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bios.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\EEprom.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\elf.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Flash.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gba.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gbacpu.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gbainline.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gbagfx.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Globals.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\RTC.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Sound.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Sram.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\System.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Functionality"
-				>
-				<File
-					RelativePath=".\src\armdis.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Cheats.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\CheatSearch.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\memgzio.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\NLS.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Port.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Reg.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\unzip.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Util.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="UI"
-				>
-				<File
-					RelativePath=".\src\win32\AboutDialog.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AccelEditor.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AcceleratorManager.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Associate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AVIWrite.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\BIOSDialog.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\BitmapControl.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\CmdAccelOb.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ColorButton.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ColorControl.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Directories.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Disassemble.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ExportGSASnapshot.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\FileDlg.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\FullscreenSettings.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GBACheats.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GDBConnection.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GSACodeSelect.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Hyperlink.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\IOViewer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\IOViewerRegs.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\IUpdate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Joypad.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\KeyboardEdit.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\LangSelect.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Logging.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MainWnd.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MapView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MaxScale.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewerAddressSize.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewerDlg.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OALConfig.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OamView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\PaletteView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\PaletteViewControl.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ResizeDlg.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\RewindInterval.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\RomInfo.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\SelectPlugin.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\StringTokenizer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Throttle.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\TileView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\UniVideoModeDlg.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\WavWriter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\WinHelper.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\WinResUtil.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ZoomControl.h"
-					>
-				</File>
-				<Filter
-					Name="GB"
-					>
-					<File
-						RelativePath=".\src\win32\GBCheatsDlg.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBColorDlg.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBDisassemble.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBMapView.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBMemoryViewerDlg.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBOamView.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBPaletteView.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBPrinterDlg.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBTileView.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="IO"
-				>
-				<File
-					RelativePath=".\src\win32\Display.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Input.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\LoadOAL.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Sound.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Main"
-				>
-				<File
-					RelativePath=".\src\win32\resource.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\stdafx.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\VBA.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="hq"
-			>
-			<Filter
-				Name="c"
-				>
-				<File
-					RelativePath=".\src\hq\c\hq3x_pattern.h"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\hq\c\hq4x_pattern.h"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\hq\c\hq_base.h"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\hq\c\hq_implementation.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\hq\c\hq_shared.h"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="asm"
-				>
-				<File
-					RelativePath=".\src\hq\asm\hq3x32.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\hq\asm\hq3x_16.asm"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -O1 -i&quot;src/hq/asm/&quot; -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -O1 -i&quot;src/hq/asm/&quot; -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\hq\asm\hq3x_32.asm"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -O1 -i&quot;src/hq/asm/&quot; -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -O1 -i&quot;src/hq/asm/&quot; -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\hq\asm\hq4x_16.asm"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -O1 -i&quot;src/hq/asm/&quot; -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -O1 -i&quot;src/hq/asm/&quot; -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\hq\asm\hq4x_32.asm"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -O1 -i&quot;src/hq/asm/&quot; -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -O1 -i&quot;src/hq/asm/&quot; -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\hq\asm\macros.mac"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="old"
-				>
-				<File
-					RelativePath=".\src\hq2x.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\hq2x.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\interp.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\lq2x.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-		<Global
-			Name="RESOURCE_FILE"
-			Value="src\win32\VBA.rc"
-		/>
-	</Globals>
-</VisualStudioProject>
diff --git a/doc/DevInfo.txt b/doc/DevInfo.txt
index 169dcdfc..a73f1ecf 100644
--- a/doc/DevInfo.txt
+++ b/doc/DevInfo.txt
@@ -15,14 +15,14 @@ Known preprocessor switches:
 - NO_OGL: Exclude OpenGL code
 - NO_D3D: Exclude Direct3D code
 - NO_OAL: Exclude OpenAL code
-- NO_XAUDIO2: Exclude XAudio2 code (supersedes DirectSound)
+- NO_XAUDIO2: Exclude XAudio2 code (the XAudio2 interface is DirectSound's successor)
 
 
 
 Download locations:
-NASM:         http://nasm.sourceforge.net
+NASM:         http://nasm.sourceforge.net/
 DirectX SDK:  http://msdn2.microsoft.com/en-us/xna/aa937788.aspx
-OpenAL SDK:   http://openal.org/downloads.html
+OpenAL SDK:   http://connect.creativelabs.com/openal/default.aspx
 OpenGL files: http://www.opengl.org/registry/
 zlib:         http://zlib.net/
 libpng:       http://libpng.org/pub/png/libpng.html
@@ -41,14 +41,18 @@ They are built with the static C runtime (this is what the releases use).
 There are two solution files for Visual C++ 2008:
 
 ===Win32/MFC===
-The Windows MFC GUI version project files are located in the root of the VBA-M sources (VBA2008.sln).
-In order to compile it, you have to compile zlib and libpng first and set your compiler's INCLUDE and LIB path accordingly.
+The Windows MFC GUI version project files are located in trunk/project/vc2008_mfc (VBA2008.sln).
+In order to compile it, you have to compile or download a precompiled version of zlib and libpng first
+and set your compiler's INCLUDE and LIB path accordingly.
 You also need Microsoft's DirectX SDK (At least for DirectInput).
 If you want to enable OpenAL sound output, install the OpenAL SDK. If you do not want it, #define NO_OAL.
-Some pixel filters come with assembler code compatible with NASM syntax. Extract NASM somewhere and add it to your PATH environment variable. All .asm files should be handled with the "nasm.rules" build rules file, also in the source root.
+Some pixel filters come with assembler code compatible with NASM syntax.
+Extract NASM somewhere and add it to your compiler's PATH environment variable.
+All .asm files should be handled with the "nasm.rules" build rules file.
 
 ===Win32/Qt===
-The MS Visual C++ 2008 Express-compatible project file can be found in /project/vc2008.
+The MS Visual C++ 2008 Express-compatible project file can be found in /project/vc2008_qt.
 It uses the qmake file in /project/qmake.
-IMPORTANT: The Qt-sources have to be compiled with the Microsoft compiler first, in order to use it. The default distribution was compiled with mingw and will not work with the MS Compiler.
+IMPORTANT: The Qt-sources have to be compiled with the Microsoft compiler first, in order to use it.
+The default distribution was compiled with mingw and will not work with the MS Compiler.
 The dependencies folder is not (yet) necessary.
diff --git a/lang/how-to.txt b/lang/how-to.txt
index 690e4fa1..2b86674a 100644
--- a/lang/how-to.txt
+++ b/lang/how-to.txt
@@ -1,4 +1,4 @@
-How to create a new translation:
+How to create a new translation for the Qt build:
 
 For Windows:
 
diff --git a/VBA2008.sln b/project/vc2008_mfc/VBA2008.sln
similarity index 90%
rename from VBA2008.sln
rename to project/vc2008_mfc/VBA2008.sln
index 1bfdc565..2478f6fc 100644
--- a/VBA2008.sln
+++ b/project/vc2008_mfc/VBA2008.sln
@@ -1,28 +1,28 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance", "VBA2008.vcproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {7AEC599C-7C82-4F00-AA60-411E0A359CB0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\dependencies\File_Extractor-0.4.3\File_Extractor2008.vcproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.Build.0 = Debug|Win32
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.ActiveCfg = Release|Win32
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.Build.0 = Release|Win32
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance", "VBA2008.vcproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {7AEC599C-7C82-4F00-AA60-411E0A359CB0}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\..\..\dependencies\File_Extractor-0.4.3\File_Extractor2008.vcproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.Build.0 = Debug|Win32
+		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.ActiveCfg = Release|Win32
+		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.Build.0 = Release|Win32
+		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32
+		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32
+		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/VBA2008.vcproj b/project/vc2008_mfc/VBA2008.vcproj
similarity index 56%
rename from VBA2008.vcproj
rename to project/vc2008_mfc/VBA2008.vcproj
index a9ce9f0c..76b79cea 100644
--- a/VBA2008.vcproj
+++ b/project/vc2008_mfc/VBA2008.vcproj
@@ -1,1499 +1,1499 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="VisualBoyAdvance"
-	ProjectGUID="{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
-	RootNamespace="VBA"
-	Keyword="MFCProj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<ToolFile
-			RelativePath=".\nasm.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)_temp"
-			ConfigurationType="1"
-			UseOfMFC="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="NASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\dependencies\File_Extractor-0.4.3\fex&quot;;..\dependencies\msvc"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR"
-				StringPooling="false"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="1"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				EnableEnhancedInstructionSet="0"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_MSC_VER=1400"
-				Culture="1033"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="nafxcwd.lib LIBCMTD.lib zlibd.lib libpngd.lib"
-				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
-				Version=""
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				GenerateManifest="true"
-				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;x86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
-				IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)_temp"
-			ConfigurationType="1"
-			UseOfMFC="1"
-			UseOfATL="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="NASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D_ST_MODEL&#x0D;&#x0A;/D_SECURE_SCL=0&#x0D;&#x0A;/Zc:forScope-&#x0D;&#x0A;/MP"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				FavorSizeOrSpeed="1"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="&quot;..\dependencies\File_Extractor-0.4.3\fex&quot;;..\dependencies\msvc"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="0"
-				FloatingPointModel="2"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_MSC_VER=1400"
-				Culture="1033"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="false"
-				IgnoreImportLibrary="false"
-				AdditionalDependencies="nafxcw.lib zlib.lib libpng.lib LIBCMT.lib"
-				ShowProgress="0"
-				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
-				Version=""
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;c:\Program Files\Microsoft DirectX SDK (November 2007)\lib\x86&quot;"
-				GenerateManifest="true"
-				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;x86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
-				GenerateDebugInformation="false"
-				AssemblyDebug="2"
-				GenerateMapFile="false"
-				MapExports="false"
-				SubSystem="2"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Signing executable..."
-				CommandLine="protect.exe $(TargetPath)"
-				ExcludedFromBuild="false"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="Filters"
-				>
-				<File
-					RelativePath=".\src\2xSaI.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WholeProgramOptimization="true"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\2xSaImmx.asm"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="NASM"
-							PreprocessorDefinitions="__DJGPP__"
-							GenerateDebugInfo="true"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="NASM"
-							Optimization="1"
-							PreprocessorDefinitions="__DJGPP__"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\admame.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bilinear.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\interframe.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pixel.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\rpi.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\scanline.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\simpleFilter.cpp"
-					>
-				</File>
-				<Filter
-					Name="HQ"
-					>
-					<File
-						RelativePath=".\src\hq2x.cpp"
-						>
-					</File>
-					<Filter
-						Name="3x_4x_asm"
-						>
-						<File
-							RelativePath=".\src\hq\asm\hq3x_16.asm"
-							>
-							<FileConfiguration
-								Name="Debug|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-									GenerateDebugInfo="true"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath=".\src\hq\asm\hq3x_32.asm"
-							>
-							<FileConfiguration
-								Name="Debug|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-									GenerateDebugInfo="true"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath=".\src\hq\asm\hq4x_16.asm"
-							>
-							<FileConfiguration
-								Name="Debug|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-									GenerateDebugInfo="true"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath=".\src\hq\asm\hq4x_32.asm"
-							>
-							<FileConfiguration
-								Name="Debug|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-									GenerateDebugInfo="true"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath=".\src\hq\asm\macros.mac"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="Functionality"
-				>
-				<File
-					RelativePath=".\src\armdis.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Cheats.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\CheatSearch.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gbafilter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\memgzio.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="1"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\Util.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="GBA"
-				>
-				<File
-					RelativePath=".\src\agb\agbprint.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bios.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\EEprom.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\elf.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Flash.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gba-arm.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gba-thumb.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gba.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gbagfx.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Globals.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode0.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode1.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode2.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode3.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode4.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mode5.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\remote.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\RTC.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Sound.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Sram.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="GB"
-				>
-				<File
-					RelativePath=".\src\dmg\gb.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbCheats.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbDis.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbGfx.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbGlobals.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbMemory.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbPrinter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbSGB.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbSound.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="UI"
-				>
-				<File
-					RelativePath=".\src\win32\AboutDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AccelEditor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AcceleratorManager.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Associate.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AVIWrite.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\BIOSDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\BitmapControl.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\CmdAccelOb.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ColorButton.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ColorControl.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Commands.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Directories.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Disassemble.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ExportGSASnapshot.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\FileDlg.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\FullscreenSettings.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GameOverrides.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GBACheats.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GDBConnection.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GSACodeSelect.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Hyperlink.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\IOViewer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Joypad.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\KeyboardEdit.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\LangSelect.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Logging.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MainWnd.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MainWndCheats.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MainWndFile.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MainWndHelp.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MainWndOptions.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MainWndTools.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MapView.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MaxScale.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewerAddressSize.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewerDlg.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OALConfig.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OamView.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\PaletteView.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\PaletteViewControl.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Reg.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ResizeDlg.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\RewindInterval.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\RomInfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\SelectPlugin.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\StringTokenizer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Throttle.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\TileView.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\WavWriter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\WinResUtil.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\XAudio2_Config.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ZoomControl.cpp"
-					>
-				</File>
-				<Filter
-					Name="GB"
-					>
-					<File
-						RelativePath=".\src\win32\GBCheatsDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBColorDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBDisassemble.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBMapView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBMemoryViewerDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBOamView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBPaletteView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBPrinterDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBTileView.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="Main"
-				>
-				<File
-					RelativePath=".\src\win32\protect.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\protect.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\stdafx.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\VBA.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="IO"
-				>
-				<File
-					RelativePath=".\src\win32\Direct3D.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\DirectInput.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\DirectSound.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\glfont.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="1"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="1"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\win32\LoadOAL.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OpenAL.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OpenGL.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\XAudio2.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Linking"
-				>
-				<File
-					RelativePath=".\src\agb\gbalink.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\LinkOptions.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="GB APU"
-				>
-				<File
-					RelativePath=".\src\dmg\gb_apu\Blip_Buffer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\Effects_Buffer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\Gb_Apu.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\Gb_Apu_State.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\Gb_Oscs.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\Multi_Buffer.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<Filter
-				Name="GB"
-				>
-				<File
-					RelativePath=".\src\dmg\gb.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbCheats.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbCodes.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbCodesCB.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbGlobals.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbMemory.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbPrinter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbSGB.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gbSound.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Filters"
-				>
-				<File
-					RelativePath=".\src\win32\rpi.h"
-					>
-				</File>
-				<Filter
-					Name="HQ"
-					>
-					<File
-						RelativePath=".\src\hq2x.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\interp.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\lq2x.h"
-						>
-					</File>
-					<Filter
-						Name="3x_4x_asm"
-						>
-						<File
-							RelativePath=".\src\hq\asm\hq3x32.cpp"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="GBA"
-				>
-				<File
-					RelativePath=".\src\agb\agbprint.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bios.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\EEprom.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\elf.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Flash.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gba.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\GBAcpu.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gbafilter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gbagfx.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\agb\gbainline.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Globals.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\RTC.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Sound.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Sram.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\System.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Functionality"
-				>
-				<File
-					RelativePath=".\src\armdis.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Cheats.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\CheatSearch.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\getopt.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\memgzio.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\NLS.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Port.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Text.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\unzip.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Util.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="UI"
-				>
-				<File
-					RelativePath=".\src\win32\AboutDialog.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AccelEditor.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AcceleratorManager.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Associate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\AVIWrite.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\BitmapControl.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\CmdAccelOb.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ColorButton.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ColorControl.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Directories.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Disassemble.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ExportGSASnapshot.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\FileDlg.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\FullscreenSettings.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GBACheats.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GDBConnection.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\GSACodeSelect.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Hyperlink.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\IOViewer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\IOViewerRegs.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\IUpdate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Joypad.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\KeyboardEdit.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\LangSelect.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Logging.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MainWnd.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MapView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MaxScale.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewerAddressSize.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\MemoryViewerDlg.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OALConfig.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\OamView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\PaletteView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\PaletteViewControl.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Reg.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ResizeDlg.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\RewindInterval.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\RomInfo.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\SelectPlugin.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\StringTokenizer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Throttle.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\TileView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\WavWriter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\WinHelper.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\WinResUtil.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\XAudio2_Config.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\ZoomControl.h"
-					>
-				</File>
-				<Filter
-					Name="GB"
-					>
-					<File
-						RelativePath=".\src\win32\GBCheatsDlg.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBColorDlg.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBDisassemble.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBMapView.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBMemoryViewerDlg.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBOamView.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBPaletteView.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBPrinterDlg.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\win32\GBTileView.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="IO"
-				>
-				<File
-					RelativePath=".\src\win32\Display.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Input.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\Sound.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Main"
-				>
-				<File
-					RelativePath=".\src\win32\stdafx.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\VBA.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Linking"
-				>
-				<File
-					RelativePath=".\src\agb\gbalink.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\win32\LinkOptions.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="GB APU"
-				>
-				<File
-					RelativePath=".\src\dmg\gb_apu\blargg_common.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\blargg_config.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\blargg_source.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\Blip_Buffer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\Effects_Buffer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\Gb_Apu.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\Gb_Oscs.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\dmg\gb_apu\Multi_Buffer.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resources"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\src\win32\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\win32\VBA-M.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\src\win32\VBA.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Documentation"
-			>
-			<File
-				RelativePath=".\doc\DevInfo.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\doc\ReadMe.txt"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-		<Global
-			Name="RESOURCE_FILE"
-			Value="src\win32\VBA.rc"
-		/>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="VisualBoyAdvance"
+	ProjectGUID="{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
+	RootNamespace="VBA"
+	Keyword="MFCProj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+		<ToolFile
+			RelativePath=".\nasm.rules"
+		/>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)_temp"
+			ConfigurationType="1"
+			UseOfMFC="1"
+			CharacterSet="0"
+			BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				ExcludedFromBuild="true"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="NASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="false"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;..\..\..\dependencies\File_Extractor-0.4.3\fex&quot;;..\..\..\dependencies\msvc"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR"
+				StringPooling="false"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="false"
+				RuntimeLibrary="1"
+				StructMemberAlignment="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				EnableEnhancedInstructionSet="0"
+				TreatWChar_tAsBuiltInType="false"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories=""
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+				ExcludedFromBuild="true"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="nafxcwd.lib LIBCMTD.lib zlibd.lib libpngd.lib"
+				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
+				Version=""
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				GenerateManifest="true"
+				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;x86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
+				IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="1"
+				EnableCOMDATFolding="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				ExcludedFromBuild="true"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)_temp"
+			ConfigurationType="1"
+			UseOfMFC="1"
+			UseOfATL="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			ManagedExtensions="0"
+			BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				ExcludedFromBuild="true"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="NASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="false"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/D_ST_MODEL&#x0D;&#x0A;/D_SECURE_SCL=0&#x0D;&#x0A;/Zc:forScope-&#x0D;&#x0A;/MP"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories="&quot;..\..\..\dependencies\File_Extractor-0.4.3\fex&quot;;..\..\..\dependencies\msvc"
+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableEnhancedInstructionSet="0"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories=""
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+				ExcludedFromBuild="true"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				RegisterOutput="false"
+				IgnoreImportLibrary="false"
+				AdditionalDependencies="nafxcw.lib zlib.lib libpng.lib LIBCMT.lib"
+				ShowProgress="0"
+				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
+				Version=""
+				LinkIncremental="0"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="&quot;c:\Program Files\Microsoft DirectX SDK (November 2007)\lib\x86&quot;"
+				GenerateManifest="true"
+				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;x86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
+				GenerateDebugInformation="false"
+				AssemblyDebug="2"
+				GenerateMapFile="false"
+				MapExports="false"
+				SubSystem="2"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				LinkTimeCodeGeneration="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Signing executable..."
+				CommandLine="protect.exe $(TargetPath)"
+				ExcludedFromBuild="false"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<Filter
+				Name="Filters"
+				>
+				<File
+					RelativePath="..\..\src\2xSaI.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							WholeProgramOptimization="true"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\2xSaImmx.asm"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="NASM"
+							PreprocessorDefinitions="__DJGPP__"
+							GenerateDebugInfo="true"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="NASM"
+							Optimization="1"
+							PreprocessorDefinitions="__DJGPP__"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\admame.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bilinear.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\interframe.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\pixel.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\rpi.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\scanline.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\simpleFilter.cpp"
+					>
+				</File>
+				<Filter
+					Name="HQ"
+					>
+					<File
+						RelativePath="..\..\src\hq2x.cpp"
+						>
+					</File>
+					<Filter
+						Name="3x_4x_asm"
+						>
+						<File
+							RelativePath="..\..\src\hq\asm\hq3x_16.asm"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								>
+								<Tool
+									Name="NASM"
+									Optimization="1"
+									IncludePath="../../src/hq/asm/"
+									DisableOrphanLabelsWarning="true"
+									GenerateDebugInfo="true"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								>
+								<Tool
+									Name="NASM"
+									Optimization="1"
+									IncludePath="../../src/hq/asm/"
+									DisableOrphanLabelsWarning="true"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\src\hq\asm\hq3x_32.asm"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								>
+								<Tool
+									Name="NASM"
+									Optimization="1"
+									IncludePath="../../src/hq/asm/"
+									DisableOrphanLabelsWarning="true"
+									GenerateDebugInfo="true"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								>
+								<Tool
+									Name="NASM"
+									Optimization="1"
+									IncludePath="../../src/hq/asm/"
+									DisableOrphanLabelsWarning="true"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\src\hq\asm\hq4x_16.asm"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								>
+								<Tool
+									Name="NASM"
+									Optimization="1"
+									IncludePath="../../src/hq/asm/"
+									DisableOrphanLabelsWarning="true"
+									GenerateDebugInfo="true"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								>
+								<Tool
+									Name="NASM"
+									Optimization="1"
+									IncludePath="../../src/hq/asm/"
+									DisableOrphanLabelsWarning="true"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\src\hq\asm\hq4x_32.asm"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								>
+								<Tool
+									Name="NASM"
+									Optimization="1"
+									IncludePath="../../src/hq/asm/"
+									DisableOrphanLabelsWarning="true"
+									GenerateDebugInfo="true"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								>
+								<Tool
+									Name="NASM"
+									Optimization="1"
+									IncludePath="../../src/hq/asm/"
+									DisableOrphanLabelsWarning="true"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\src\hq\asm\macros.mac"
+							>
+						</File>
+					</Filter>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Functionality"
+				>
+				<File
+					RelativePath="..\..\src\armdis.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Cheats.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\CheatSearch.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\gbafilter.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\memgzio.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="1"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\protect.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Util.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="GBA"
+				>
+				<File
+					RelativePath="..\..\src\agb\agbprint.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bios.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\EEprom.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\elf.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Flash.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\gba-arm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\gba-thumb.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\gba.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\gbagfx.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Globals.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Mode0.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Mode1.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Mode2.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Mode3.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Mode4.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Mode5.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\remote.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\RTC.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Sound.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Sram.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="GB"
+				>
+				<File
+					RelativePath="..\..\src\dmg\gb.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbCheats.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbDis.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbGfx.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbGlobals.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbMemory.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbPrinter.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbSGB.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbSound.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="UI"
+				>
+				<File
+					RelativePath="..\..\src\win32\AboutDialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\AccelEditor.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\AcceleratorManager.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Associate.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\AVIWrite.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\BIOSDialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\BitmapControl.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\CmdAccelOb.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\ColorButton.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\ColorControl.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Commands.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Directories.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Disassemble.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\ExportGSASnapshot.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\FileDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\FullscreenSettings.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GameOverrides.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBACheats.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GDBConnection.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GSACodeSelect.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Hyperlink.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\IOViewer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Joypad.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\KeyboardEdit.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\LangSelect.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Logging.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MainWnd.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MainWndCheats.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MainWndFile.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MainWndHelp.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MainWndOptions.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MainWndTools.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MapView.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MaxScale.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MemoryViewer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MemoryViewerAddressSize.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MemoryViewerDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\OALConfig.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\OamView.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\PaletteView.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\PaletteViewControl.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Reg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\ResizeDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\RewindInterval.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\RomInfo.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\SelectPlugin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\StringTokenizer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Throttle.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\TileView.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\WavWriter.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\WinResUtil.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\XAudio2_Config.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\ZoomControl.cpp"
+					>
+				</File>
+				<Filter
+					Name="GB"
+					>
+					<File
+						RelativePath="..\..\src\win32\GBCheatsDlg.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBColorDlg.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBDisassemble.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBMapView.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBMemoryViewerDlg.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBOamView.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBPaletteView.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBPrinterDlg.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBTileView.cpp"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Main"
+				>
+				<File
+					RelativePath="..\..\src\win32\stdafx.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\VBA.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="IO"
+				>
+				<File
+					RelativePath="..\..\src\win32\Direct3D.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\DirectInput.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\DirectSound.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\glfont.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="1"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\LoadOAL.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\OpenAL.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\OpenGL.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\XAudio2.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Linking"
+				>
+				<File
+					RelativePath="..\..\src\agb\gbalink.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\LinkOptions.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="GB APU"
+				>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Blip_Buffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Effects_Buffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Gb_Apu.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Gb_Apu_State.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Gb_Oscs.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Multi_Buffer.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<Filter
+				Name="GB"
+				>
+				<File
+					RelativePath="..\..\src\dmg\gb.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbCheats.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbCodes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbCodesCB.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbGlobals.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbMemory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbPrinter.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbSGB.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbSound.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Filters"
+				>
+				<File
+					RelativePath="..\..\src\win32\rpi.h"
+					>
+				</File>
+				<Filter
+					Name="HQ"
+					>
+					<File
+						RelativePath="..\..\src\hq2x.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\interp.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\lq2x.h"
+						>
+					</File>
+					<Filter
+						Name="3x_4x_asm"
+						>
+						<File
+							RelativePath="..\..\src\hq\asm\hq3x32.cpp"
+							>
+						</File>
+					</Filter>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="GBA"
+				>
+				<File
+					RelativePath="..\..\src\agb\agbprint.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bios.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\EEprom.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\elf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Flash.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\gba.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\GBAcpu.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\gbafilter.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\gbagfx.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\gbainline.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Globals.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\RTC.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Sound.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Sram.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\System.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Functionality"
+				>
+				<File
+					RelativePath="..\..\src\armdis.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Cheats.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\CheatSearch.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\getopt.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\memgzio.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\NLS.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Port.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\protect.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Text.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\unzip.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\Util.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="UI"
+				>
+				<File
+					RelativePath="..\..\src\win32\AboutDialog.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\AccelEditor.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\AcceleratorManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Associate.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\AVIWrite.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\BitmapControl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\CmdAccelOb.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\ColorButton.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\ColorControl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Directories.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Disassemble.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\ExportGSASnapshot.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\FileDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\FullscreenSettings.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBACheats.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GDBConnection.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GSACodeSelect.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Hyperlink.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\IOViewer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\IOViewerRegs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\IUpdate.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Joypad.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\KeyboardEdit.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\LangSelect.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Logging.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MainWnd.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MapView.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MaxScale.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MemoryViewer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MemoryViewerAddressSize.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\MemoryViewerDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\OALConfig.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\OamView.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\PaletteView.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\PaletteViewControl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Reg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\ResizeDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\RewindInterval.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\RomInfo.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\SelectPlugin.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\StringTokenizer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Throttle.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\TileView.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\WavWriter.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\WinHelper.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\WinResUtil.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\XAudio2_Config.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\ZoomControl.h"
+					>
+				</File>
+				<Filter
+					Name="GB"
+					>
+					<File
+						RelativePath="..\..\src\win32\GBCheatsDlg.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBColorDlg.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBDisassemble.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBMapView.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBMemoryViewerDlg.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBOamView.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBPaletteView.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBPrinterDlg.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\win32\GBTileView.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="IO"
+				>
+				<File
+					RelativePath="..\..\src\win32\Display.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Input.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\Sound.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Main"
+				>
+				<File
+					RelativePath="..\..\src\win32\stdafx.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\VBA.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Linking"
+				>
+				<File
+					RelativePath="..\..\src\agb\gbalink.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\LinkOptions.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="GB APU"
+				>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\blargg_common.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\blargg_config.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\blargg_source.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Blip_Buffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Effects_Buffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Gb_Apu.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Gb_Oscs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Multi_Buffer.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resources"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\src\win32\resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\VBA-M.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\VBA.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Documentation"
+			>
+			<File
+				RelativePath="..\..\doc\DevInfo.txt"
+				>
+			</File>
+			<File
+				RelativePath="..\..\doc\ReadMe.txt"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+		<Global
+			Name="RESOURCE_FILE"
+			Value="src\win32\VBA.rc"
+		/>
+	</Globals>
+</VisualStudioProject>
diff --git a/nasm.rules b/project/vc2008_mfc/nasm.rules
similarity index 100%
rename from nasm.rules
rename to project/vc2008_mfc/nasm.rules
diff --git a/project/vc2008/vba-m.sln b/project/vc2008_qt/vba-m.sln
similarity index 100%
rename from project/vc2008/vba-m.sln
rename to project/vc2008_qt/vba-m.sln
diff --git a/project/vc2008/vba-m.vcproj b/project/vc2008_qt/vba-m.vcproj
similarity index 100%
rename from project/vc2008/vba-m.vcproj
rename to project/vc2008_qt/vba-m.vcproj
diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp
index bf54bb20..e96ed153 100644
--- a/src/win32/VBA.cpp
+++ b/src/win32/VBA.cpp
@@ -295,6 +295,7 @@ VBA::VBA()
   oalBufferCount = 5;
 #endif
 #ifndef NO_XAUDIO2
+  audioAPI = XAUDIO2;
   xa2Device = 0;
   xa2BufferCount = 4;
   xa2Upmixing = false;
@@ -1546,7 +1547,7 @@ void VBA::loadSettings()
   }
 #endif
 
-  audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", DIRECTSOUND );
+  audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", XAUDIO2 );
   if( ( audioAPI != DIRECTSOUND )
 #ifndef NO_OAL
 	  && ( audioAPI != OPENAL_SOUND )
@@ -1555,7 +1556,11 @@ void VBA::loadSettings()
 	  && ( audioAPI != XAUDIO2 )
 #endif
 	  ) {
-		  audioAPI = DIRECTSOUND;
+#ifndef NO_XAUDIO2
+        audioAPI = XAUDIO2;
+#else
+        audioAPI = DIRECTSOUND;
+#endif
   }
 
   windowPositionX = regQueryDwordValue("windowX", 0);
diff --git a/src/win32/XAudio2_Config.cpp b/src/win32/XAudio2_Config.cpp
index 74a0b3d7..3af3d77b 100644
--- a/src/win32/XAudio2_Config.cpp
+++ b/src/win32/XAudio2_Config.cpp
@@ -111,7 +111,9 @@ BOOL XAudio2_Config::OnInitDialog()
 					systemMessage( IDS_XAUDIO2_CANNOT_ENUMERATE_DEVICES, NULL );
 					break;
 				} else {
-#ifdef _MBCS
+#ifdef _UNICODE
+					int id = m_combo_dev.AddString( dd.DisplayName );
+#else
 					CHAR temp[256];
 					ZeroMemory( temp, sizeof( temp ) );
 					WideCharToMultiByte(
@@ -125,9 +127,6 @@ BOOL XAudio2_Config::OnInitDialog()
 						NULL );
 					
 					int id = m_combo_dev.AddString( temp );
-#endif
-#ifdef _UNICODE
-					int id = m_combo_dev.AddString( dd.DisplayName );
 #endif
 					if( id < 0 ) {
 						systemMessage( IDS_XAUDIO2_CANNOT_ENUMERATE_DEVICES, NULL );