diff --git a/project/vc2008_mfc/VBA2008.vcproj b/project/vc2008_mfc/VBA2008.vcproj
index 3f354274..7dcbc0ee 100644
--- a/project/vc2008_mfc/VBA2008.vcproj
+++ b/project/vc2008_mfc/VBA2008.vcproj
@@ -31,7 +31,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\dependencies\SubWCRev.exe ..\.. svnrev_template.h ..\..\src\svnrev.h"
+				CommandLine="..\..\..\dependencies\SubWCRev\SubWCRev.bat"
 				ExcludedFromBuild="false"
 			/>
 			<Tool
@@ -54,7 +54,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\fex;..\..\..\dependencies\lpng140;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\zlib"
+				AdditionalIncludeDirectories="..\..\src;..\..\fex;..\..\..\dependencies\lpng140;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR"
 				StringPooling="false"
 				MinimalRebuild="true"
@@ -140,7 +140,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\dependencies\SubWCRev.exe ..\.. svnrev_template.h ..\..\src\svnrev.h"
+				CommandLine="..\..\..\dependencies\SubWCRev\SubWCRev.bat"
 				ExcludedFromBuild="false"
 			/>
 			<Tool
@@ -167,7 +167,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\..\fex;..\..\..\dependencies\lpng140;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\zlib"
+				AdditionalIncludeDirectories="..\..\src;..\..\fex;..\..\..\dependencies\lpng140;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
diff --git a/project/vc2008_mfc/svnrev_template.h b/project/vc2008_mfc/svnrev_template.h
deleted file mode 100644
index db42e183..00000000
--- a/project/vc2008_mfc/svnrev_template.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SVN_REV $WCREV$
-#define SVN_REV_STR "$WCREV$"
diff --git a/project/vs2010_mfc/VBA2010.vcxproj b/project/vs2010_mfc/VBA2010.vcxproj
index 9af2e2ca..a359bbd6 100644
--- a/project/vs2010_mfc/VBA2010.vcxproj
+++ b/project/vs2010_mfc/VBA2010.vcxproj
@@ -55,7 +55,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <BuildLog />
     <PreBuildEvent>
-      <Command>SubWCRev.exe ..\.. svnrev_template.h ..\..\src\svnrev.h</Command>
+      <Command>"..\..\..\dependencies\SubWCRev\SubWCRev.bat"</Command>
     </PreBuildEvent>
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -63,7 +63,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\fex;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;..\..\fex;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -100,7 +100,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <BuildLog />
     <PreBuildEvent>
-      <Command>SubWCRev.exe ..\.. svnrev_template.h ..\..\src\svnrev.h</Command>
+      <Command>"..\..\..\dependencies\SubWCRev\SubWCRev.bat"</Command>
     </PreBuildEvent>
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -111,8 +111,8 @@
 /D_SECURE_SCL=0 %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\fex;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\src;..\..\fex;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;C_CORE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
diff --git a/project/vs2010_mfc/svnrev_template.h b/project/vs2010_mfc/svnrev_template.h
deleted file mode 100644
index db42e183..00000000
--- a/project/vs2010_mfc/svnrev_template.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SVN_REV $WCREV$
-#define SVN_REV_STR "$WCREV$"
diff --git a/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.sln b/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.sln
deleted file mode 100644
index e5211571..00000000
--- a/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.sln
+++ /dev/null
@@ -1,51 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{8B814174-883E-43D0-969E-3A17D8EDE080}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance-M", "VBA2010.vcxproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\dependencies\zlib\project\vs2010\zlib.vcxproj", "{3E03C179-8251-46E4-81F4-466F114BAC63}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\..\..\dependencies\SFML\build\vc2010\sfml-network.vcxproj", "{823DDC98-42D5-4A38-88CF-9DC06C788AE4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\..\dependencies\libpng\project\vs2010\libpng.vcxproj", "{0008960E-E0DD-41A6-8265-00B31DDB4C21}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\..\fex\File_Extractor2010.vcxproj", "{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
-		{3E03C179-8251-46E4-81F4-466F114BAC63}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3E03C179-8251-46E4-81F4-466F114BAC63}.Debug|Win32.Build.0 = Debug|Win32
-		{3E03C179-8251-46E4-81F4-466F114BAC63}.Release|Win32.ActiveCfg = Release|Win32
-		{3E03C179-8251-46E4-81F4-466F114BAC63}.Release|Win32.Build.0 = Release|Win32
-		{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|Win32.Build.0 = Debug|Win32
-		{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|Win32.ActiveCfg = Release|Win32
-		{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|Win32.Build.0 = Release|Win32
-		{0008960E-E0DD-41A6-8265-00B31DDB4C21}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0008960E-E0DD-41A6-8265-00B31DDB4C21}.Debug|Win32.Build.0 = Debug|Win32
-		{0008960E-E0DD-41A6-8265-00B31DDB4C21}.Release|Win32.ActiveCfg = Release|Win32
-		{0008960E-E0DD-41A6-8265-00B31DDB4C21}.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
-	GlobalSection(NestedProjects) = preSolution
-		{3E03C179-8251-46E4-81F4-466F114BAC63} = {8B814174-883E-43D0-969E-3A17D8EDE080}
-		{823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {8B814174-883E-43D0-969E-3A17D8EDE080}
-		{0008960E-E0DD-41A6-8265-00B31DDB4C21} = {8B814174-883E-43D0-969E-3A17D8EDE080}
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {8B814174-883E-43D0-969E-3A17D8EDE080}
-	EndGlobalSection
-EndGlobal
diff --git a/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.vcxproj b/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.vcxproj
deleted file mode 100644
index 37c2f8d0..00000000
--- a/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.vcxproj
+++ /dev/null
@@ -1,681 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>VisualBoyAdvance-M</ProjectName>
-    <ProjectGuid>{6D4C5EC8-933F-4C05-A1BF-498E658576DF}</ProjectGuid>
-    <RootNamespace>VBA</RootNamespace>
-    <Keyword>MFCProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="nasm.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="per_user_settings.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="per_user_settings.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files (x86)\OpenAL 1.1 SDK\libs\Win32;C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Lib\x86;$(LibraryPath)</LibraryPath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files (x86)\OpenAL 1.1 SDK\include;C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Include;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%programfiles%\OpenAL 1.1 SDK\libs\Win32;$(DXSDK_DIR)\lib\x86;$(LibraryPath)</LibraryPath>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Platform)\$(Configuration)_temp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Platform)\$(Configuration)_temp\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <BuildLog />
-    <PreBuildEvent>
-      <Command>SubWCRev.exe ..\.. svnrev_template.h ..\..\src\svnrev.h</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\fex;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>false</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
-    <ResourceCompile />
-    <Link>
-      <Version>
-      </Version>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <MinimumRequiredVersion>5.0</MinimumRequiredVersion>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-    <BuildLog>
-      <Path>$(IntDir)$(ProjectName)_BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog />
-    <PreBuildEvent>
-      <Command>SubWCRev.exe ..\.. svnrev_template.h ..\..\src\svnrev.h</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/D_ST_MODEL
-/D_SECURE_SCL=0
-/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\fex;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile />
-    <Link>
-      <AdditionalDependencies>nafxcw.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <SubSystem>Windows</SubSystem>
-      <MinimumRequiredVersion>5.0</MinimumRequiredVersion>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AssemblyDebug>
-      </AssemblyDebug>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-    <NASM>
-      <Optimization>1</Optimization>
-    </NASM>
-    <BuildLog />
-    <BuildLog>
-      <Path>$(IntDir)$(ProjectName)_BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\win32\resource.h" />
-    <ClInclude Include="..\..\src\gb\gb.h" />
-    <ClInclude Include="..\..\src\gb\gbCheats.h" />
-    <ClInclude Include="..\..\src\gb\gbCodes.h" />
-    <ClInclude Include="..\..\src\gb\gbCodesCB.h" />
-    <ClInclude Include="..\..\src\gb\gbGlobals.h" />
-    <ClInclude Include="..\..\src\gb\gbMemory.h" />
-    <ClInclude Include="..\..\src\gb\gbPrinter.h" />
-    <ClInclude Include="..\..\src\gb\gbSGB.h" />
-    <ClInclude Include="..\..\src\gb\gbSound.h" />
-    <ClInclude Include="..\..\src\apu\blargg_common.h" />
-    <ClInclude Include="..\..\src\apu\blargg_config.h" />
-    <ClInclude Include="..\..\src\apu\blargg_source.h" />
-    <ClInclude Include="..\..\src\apu\Blip_Buffer.h" />
-    <ClInclude Include="..\..\src\apu\Effects_Buffer.h" />
-    <ClInclude Include="..\..\src\apu\Gb_Apu.h" />
-    <ClInclude Include="..\..\src\apu\Gb_Oscs.h" />
-    <ClInclude Include="..\..\src\apu\Multi_Buffer.h" />
-    <ClInclude Include="..\..\src\gba\agbprint.h" />
-    <ClInclude Include="..\..\src\gba\bios.h" />
-    <ClInclude Include="..\..\src\gba\EEprom.h" />
-    <ClInclude Include="..\..\src\gba\elf.h" />
-    <ClInclude Include="..\..\src\gba\Flash.h" />
-    <ClInclude Include="..\..\src\gba\gba.h" />
-    <ClInclude Include="..\..\src\gba\GBAcpu.h" />
-    <ClInclude Include="..\..\src\gba\gbagfx.h" />
-    <ClInclude Include="..\..\src\gba\gbainline.h" />
-    <ClInclude Include="..\..\src\gba\Globals.h" />
-    <ClInclude Include="..\..\src\gba\RTC.h" />
-    <ClInclude Include="..\..\src\gba\Sound.h" />
-    <ClInclude Include="..\..\src\gba\Sram.h" />
-    <ClInclude Include="..\..\src\System.h" />
-    <ClInclude Include="..\..\src\win32\rpi.h" />
-    <ClInclude Include="..\..\src\filters\hq2x.h" />
-    <ClInclude Include="..\..\src\filters\interp.h" />
-    <ClInclude Include="..\..\src\filters\lq2x.h" />
-    <ClInclude Include="..\..\src\gba\armdis.h" />
-    <ClInclude Include="..\..\src\gba\Cheats.h" />
-    <ClInclude Include="..\..\src\gba\CheatSearch.h" />
-    <ClInclude Include="..\..\src\common\memgzio.h" />
-    <ClInclude Include="..\..\src\NLS.h" />
-    <ClInclude Include="..\..\src\common\Patch.h" />
-    <ClInclude Include="..\..\src\common\Port.h" />
-    <ClInclude Include="..\..\src\Util.h" />
-    <ClInclude Include="..\..\src\version.h" />
-    <ClInclude Include="..\..\src\win32\Display.h" />
-    <ClInclude Include="..\..\src\win32\glfont.h" />
-    <ClInclude Include="..\..\src\win32\gzglfont.h" />
-    <ClInclude Include="..\..\src\win32\Input.h" />
-    <ClInclude Include="..\..\src\common\SoundDriver.h" />
-    <ClInclude Include="..\..\src\gba\gbalink.h" />
-    <ClInclude Include="..\..\src\gba\GBASockClient.h" />
-    <ClInclude Include="..\..\src\win32\JoybusOptions.h" />
-    <ClInclude Include="..\..\src\win32\LinkOptions.h" />
-    <ClInclude Include="..\..\src\win32\stdafx.h" />
-    <ClInclude Include="..\..\src\win32\targetver.h" />
-    <ClInclude Include="..\..\src\win32\VBA.h" />
-    <ClInclude Include="..\..\src\win32\AboutDialog.h" />
-    <ClInclude Include="..\..\src\win32\AccelEditor.h" />
-    <ClInclude Include="..\..\src\win32\AcceleratorManager.h" />
-    <ClInclude Include="..\..\src\win32\Associate.h" />
-    <ClInclude Include="..\..\src\win32\AudioCoreSettingsDlg.h" />
-    <ClInclude Include="..\..\src\win32\AVIWrite.h" />
-    <ClInclude Include="..\..\src\win32\BIOSDialog.h" />
-    <ClInclude Include="..\..\src\win32\BitmapControl.h" />
-    <ClInclude Include="..\..\src\win32\CmdAccelOb.h" />
-    <ClInclude Include="..\..\src\win32\ColorButton.h" />
-    <ClInclude Include="..\..\src\win32\ColorControl.h" />
-    <ClInclude Include="..\..\src\win32\Directories.h" />
-    <ClInclude Include="..\..\src\win32\Disassemble.h" />
-    <ClInclude Include="..\..\src\win32\ExportGSASnapshot.h" />
-    <ClInclude Include="..\..\src\win32\FileDlg.h" />
-    <ClInclude Include="..\..\src\win32\FullscreenSettings.h" />
-    <ClInclude Include="..\..\src\win32\GBACheats.h" />
-    <ClInclude Include="..\..\src\win32\GDBConnection.h" />
-    <ClInclude Include="..\..\src\win32\GSACodeSelect.h" />
-    <ClInclude Include="..\..\src\win32\Hyperlink.h" />
-    <ClInclude Include="..\..\src\win32\IOViewer.h" />
-    <ClInclude Include="..\..\src\win32\IOViewerRegs.h" />
-    <ClInclude Include="..\..\src\win32\IUpdate.h" />
-    <ClInclude Include="..\..\src\win32\Joypad.h" />
-    <ClInclude Include="..\..\src\win32\KeyboardEdit.h" />
-    <ClInclude Include="..\..\src\win32\LangSelect.h" />
-    <ClInclude Include="..\..\src\win32\Logging.h" />
-    <ClInclude Include="..\..\src\win32\MainWnd.h" />
-    <ClInclude Include="..\..\src\win32\MapView.h" />
-    <ClInclude Include="..\..\src\win32\MaxScale.h" />
-    <ClInclude Include="..\..\src\win32\MemoryViewer.h" />
-    <ClInclude Include="..\..\src\win32\MemoryViewerAddressSize.h" />
-    <ClInclude Include="..\..\src\win32\MemoryViewerDlg.h" />
-    <ClInclude Include="..\..\src\win32\OALConfig.h" />
-    <ClInclude Include="..\..\src\win32\OamView.h" />
-    <ClInclude Include="..\..\src\win32\PaletteView.h" />
-    <ClInclude Include="..\..\src\win32\PaletteViewControl.h" />
-    <ClInclude Include="..\..\src\win32\Reg.h" />
-    <ClInclude Include="..\..\src\win32\ResizeDlg.h" />
-    <ClInclude Include="..\..\src\win32\RewindInterval.h" />
-    <ClInclude Include="..\..\src\win32\RomInfo.h" />
-    <ClInclude Include="..\..\src\win32\SelectPlugin.h" />
-    <ClInclude Include="..\..\src\win32\StringTokenizer.h" />
-    <ClInclude Include="..\..\src\win32\Throttle.h" />
-    <ClInclude Include="..\..\src\win32\TileView.h" />
-    <ClInclude Include="..\..\src\win32\WavWriter.h" />
-    <ClInclude Include="..\..\src\win32\WinHelper.h" />
-    <ClInclude Include="..\..\src\win32\WinResUtil.h" />
-    <ClInclude Include="..\..\src\win32\XAudio2_Config.h" />
-    <ClInclude Include="..\..\src\win32\ZoomControl.h" />
-    <ClInclude Include="..\..\src\win32\GBCheatsDlg.h" />
-    <ClInclude Include="..\..\src\win32\GBColorDlg.h" />
-    <ClInclude Include="..\..\src\win32\GBDisassemble.h" />
-    <ClInclude Include="..\..\src\win32\GBMapView.h" />
-    <ClInclude Include="..\..\src\win32\GBMemoryViewerDlg.h" />
-    <ClInclude Include="..\..\src\win32\GBOamView.h" />
-    <ClInclude Include="..\..\src\win32\GBPaletteView.h" />
-    <ClInclude Include="..\..\src\win32\GBPrinterDlg.h" />
-    <ClInclude Include="..\..\src\win32\GBTileView.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\src\win32\res\VBA.ico" />
-    <None Include="..\..\src\win32\res\VBA.rc2" />
-    <None Include="..\..\doc\DevInfo.txt" />
-    <None Include="..\..\doc\License.txt" />
-    <None Include="..\..\doc\ReadMe.MFC.txt" />
-    <None Include="..\..\src\filters\hq\asm\macros.mac" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\win32\VBA.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\gb\gb.cpp" />
-    <ClCompile Include="..\..\src\gb\gbCheats.cpp" />
-    <ClCompile Include="..\..\src\gb\gbDis.cpp" />
-    <ClCompile Include="..\..\src\gb\gbGfx.cpp" />
-    <ClCompile Include="..\..\src\gb\gbGlobals.cpp" />
-    <ClCompile Include="..\..\src\gb\gbMemory.cpp" />
-    <ClCompile Include="..\..\src\gb\gbPrinter.cpp" />
-    <ClCompile Include="..\..\src\gb\gbSGB.cpp" />
-    <ClCompile Include="..\..\src\gb\gbSound.cpp" />
-    <ClCompile Include="..\..\src\apu\Blip_Buffer.cpp" />
-    <ClCompile Include="..\..\src\apu\Effects_Buffer.cpp" />
-    <ClCompile Include="..\..\src\apu\Gb_Apu.cpp" />
-    <ClCompile Include="..\..\src\apu\Gb_Apu_State.cpp" />
-    <ClCompile Include="..\..\src\apu\Gb_Oscs.cpp" />
-    <ClCompile Include="..\..\src\apu\Multi_Buffer.cpp" />
-    <ClCompile Include="..\..\src\gba\agbprint.cpp" />
-    <ClCompile Include="..\..\src\gba\bios.cpp" />
-    <ClCompile Include="..\..\src\gba\EEprom.cpp" />
-    <ClCompile Include="..\..\src\gba\elf.cpp" />
-    <ClCompile Include="..\..\src\gba\Flash.cpp" />
-    <ClCompile Include="..\..\src\gba\gba-arm.cpp" />
-    <ClCompile Include="..\..\src\gba\gba-thumb.cpp" />
-    <ClCompile Include="..\..\src\gba\gba.cpp" />
-    <ClCompile Include="..\..\src\gba\gbafilter.cpp" />
-    <ClCompile Include="..\..\src\gba\gbagfx.cpp" />
-    <ClCompile Include="..\..\src\gba\Globals.cpp" />
-    <ClCompile Include="..\..\src\gba\Mode0.cpp" />
-    <ClCompile Include="..\..\src\gba\Mode1.cpp" />
-    <ClCompile Include="..\..\src\gba\Mode2.cpp" />
-    <ClCompile Include="..\..\src\gba\Mode3.cpp" />
-    <ClCompile Include="..\..\src\gba\Mode4.cpp" />
-    <ClCompile Include="..\..\src\gba\Mode5.cpp" />
-    <ClCompile Include="..\..\src\gba\remote.cpp" />
-    <ClCompile Include="..\..\src\gba\RTC.cpp" />
-    <ClCompile Include="..\..\src\gba\Sound.cpp" />
-    <ClCompile Include="..\..\src\gba\Sram.cpp" />
-    <ClCompile Include="..\..\src\filters\2xSaI.cpp">
-      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</WholeProgramOptimization>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filters\admame.cpp" />
-    <ClCompile Include="..\..\src\filters\bilinear.cpp" />
-    <ClCompile Include="..\..\src\filters\interframe.cpp" />
-    <ClCompile Include="..\..\src\filters\pixel.cpp" />
-    <ClCompile Include="..\..\src\win32\rpi.cpp" />
-    <ClCompile Include="..\..\src\filters\scanline.cpp" />
-    <ClCompile Include="..\..\src\filters\simpleFilter.cpp" />
-    <ClCompile Include="..\..\src\filters\hq2x.cpp" />
-    <ClCompile Include="..\..\src\filters\hq\asm\hq3x32.cpp" />
-    <ClCompile Include="..\..\src\gba\armdis.cpp" />
-    <ClCompile Include="..\..\src\gba\Cheats.cpp" />
-    <ClCompile Include="..\..\src\gba\CheatSearch.cpp" />
-    <ClCompile Include="..\..\src\common\memgzio.c" />
-    <ClCompile Include="..\..\src\common\Patch.cpp" />
-    <ClCompile Include="..\..\src\Util.cpp" />
-    <ClCompile Include="..\..\src\win32\Direct3D.cpp" />
-    <ClCompile Include="..\..\src\win32\DirectInput.cpp" />
-    <ClCompile Include="..\..\src\win32\DirectSound.cpp" />
-    <ClCompile Include="..\..\src\win32\glfont.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\LoadOAL.cpp" />
-    <ClCompile Include="..\..\src\win32\OpenAL.cpp" />
-    <ClCompile Include="..\..\src\win32\OpenGL.cpp" />
-    <ClCompile Include="..\..\src\win32\XAudio2.cpp" />
-    <ClCompile Include="..\..\src\gba\gbalink.cpp" />
-    <ClCompile Include="..\..\src\gba\GBASockClient.cpp">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\JoybusOptions.cpp" />
-    <ClCompile Include="..\..\src\win32\LinkOptions.cpp" />
-    <ClCompile Include="..\..\src\win32\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\VBA.cpp" />
-    <ClCompile Include="..\..\src\win32\AboutDialog.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\AccelEditor.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\AcceleratorManager.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Associate.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\AudioCoreSettingsDlg.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\AVIWrite.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\BIOSDialog.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\BitmapControl.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\CmdAccelOb.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\ColorButton.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\ColorControl.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Commands.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Directories.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Disassemble.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\ExportGSASnapshot.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\FileDlg.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\FullscreenSettings.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GameOverrides.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBACheats.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GDBConnection.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GSACodeSelect.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Hyperlink.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\IOViewer.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Joypad.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\KeyboardEdit.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\LangSelect.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Logging.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWnd.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWndCheats.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWndFile.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWndHelp.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWndOptions.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWndTools.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MapView.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MaxScale.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MemoryViewer.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MemoryViewerAddressSize.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MemoryViewerDlg.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\OALConfig.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\OamView.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\PaletteView.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\PaletteViewControl.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Reg.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\ResizeDlg.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\RewindInterval.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\RomInfo.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\SelectPlugin.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\StringTokenizer.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Throttle.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\TileView.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\WavWriter.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\WinResUtil.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\XAudio2_Config.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\ZoomControl.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBCheatsDlg.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBColorDlg.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBDisassemble.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBMapView.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBMemoryViewerDlg.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBOamView.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBPaletteView.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBPrinterDlg.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBTileView.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <NASM Include="..\..\src\filters\2xSaImmx.asm">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">__DJGPP__</PreprocessorDefinitions>
-      <GenerateDebugInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateDebugInfo>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">1</Optimization>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">__DJGPP__</PreprocessorDefinitions>
-    </NASM>
-    <NASM Include="..\..\src\filters\hq\asm\hq3x_16.asm">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">1</Optimization>
-      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../src/filters/hq/asm/</IncludePath>
-      <DisableOrphanLabelsWarning Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DisableOrphanLabelsWarning>
-      <GenerateDebugInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateDebugInfo>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">1</Optimization>
-      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../src/filters/hq/asm/</IncludePath>
-      <DisableOrphanLabelsWarning Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DisableOrphanLabelsWarning>
-    </NASM>
-    <NASM Include="..\..\src\filters\hq\asm\hq3x_32.asm">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">1</Optimization>
-      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../src/filters/hq/asm/</IncludePath>
-      <DisableOrphanLabelsWarning Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DisableOrphanLabelsWarning>
-      <GenerateDebugInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateDebugInfo>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">1</Optimization>
-      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../src/filters/hq/asm/</IncludePath>
-      <DisableOrphanLabelsWarning Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DisableOrphanLabelsWarning>
-    </NASM>
-    <NASM Include="..\..\src\filters\hq\asm\hq4x_16.asm">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">1</Optimization>
-      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../src/filters/hq/asm/</IncludePath>
-      <DisableOrphanLabelsWarning Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DisableOrphanLabelsWarning>
-      <GenerateDebugInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateDebugInfo>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">1</Optimization>
-      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../src/filters/hq/asm/</IncludePath>
-      <DisableOrphanLabelsWarning Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DisableOrphanLabelsWarning>
-    </NASM>
-    <NASM Include="..\..\src\filters\hq\asm\hq4x_32.asm">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">1</Optimization>
-      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../src/filters/hq/asm/</IncludePath>
-      <DisableOrphanLabelsWarning Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DisableOrphanLabelsWarning>
-      <GenerateDebugInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateDebugInfo>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">1</Optimization>
-      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../src/filters/hq/asm/</IncludePath>
-      <DisableOrphanLabelsWarning Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DisableOrphanLabelsWarning>
-    </NASM>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\dependencies\libpng\project\vs2010\libpng.vcxproj">
-      <Project>{0008960e-e0dd-41a6-8265-00b31ddb4c21}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\dependencies\SFML\build\vc2010\sfml-network.vcxproj">
-      <Project>{823ddc98-42d5-4a38-88cf-9dc06c788ae4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\dependencies\zlib\project\vs2010\zlib.vcxproj">
-      <Project>{3e03c179-8251-46e4-81f4-466f114bac63}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\fex\File_Extractor2010.vcxproj">
-      <Project>{7aec599c-7c82-4f00-aa60-411e0a359cb0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="nasm.targets" />
-  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties RESOURCE_FILE="" />
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.vcxproj.filters b/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.vcxproj.filters
deleted file mode 100644
index 689f593f..00000000
--- a/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.vcxproj.filters
+++ /dev/null
@@ -1,832 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
-    </Filter>
-    <Filter Include="Documentation">
-      <UniqueIdentifier>{f0c26c7f-e258-4a13-9c2d-a22ab5905334}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core">
-      <UniqueIdentifier>{a9a364ed-450b-4d5e-ae12-4ec20e672df4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\GB">
-      <UniqueIdentifier>{41a6e259-9654-4e9f-b41c-8a8eebab2155}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\GB APU">
-      <UniqueIdentifier>{b73f8721-e525-47b0-bb29-bad7306bfeac}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\GBA">
-      <UniqueIdentifier>{d6df8b89-50c6-42d7-ab82-20ed668b2db2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Pixel Filter">
-      <UniqueIdentifier>{6a743a87-48d3-4e7a-ab79-7fb51e1ce173}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Pixel Filter\HQ">
-      <UniqueIdentifier>{b20dd5ab-a733-4ee9-a294-13ce221a09ba}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Pixel Filter\HQ\3x_4x_asm">
-      <UniqueIdentifier>{443f5282-9e21-46cb-b187-746986699f99}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Functionality">
-      <UniqueIdentifier>{b9123fa0-e9e8-444a-a69c-82a2d3bee747}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IO">
-      <UniqueIdentifier>{6ed60031-33a3-41aa-88e4-dc543b658179}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Linking">
-      <UniqueIdentifier>{ba70870a-3810-4e40-b6ab-49e438da80f9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Main">
-      <UniqueIdentifier>{8b031169-88b8-4924-a1ee-ff59ff441b42}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFC">
-      <UniqueIdentifier>{ddc4ba22-6aa2-4862-9c26-25d43a7ccdb7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFC\GB">
-      <UniqueIdentifier>{6a6d7a7e-ba3c-4ae8-86ed-189be12fb532}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\win32\resource.h">
-      <Filter>Resource</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gb\gb.h">
-      <Filter>Core\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gb\gbCheats.h">
-      <Filter>Core\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gb\gbCodes.h">
-      <Filter>Core\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gb\gbCodesCB.h">
-      <Filter>Core\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gb\gbGlobals.h">
-      <Filter>Core\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gb\gbMemory.h">
-      <Filter>Core\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gb\gbPrinter.h">
-      <Filter>Core\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gb\gbSGB.h">
-      <Filter>Core\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gb\gbSound.h">
-      <Filter>Core\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\apu\blargg_common.h">
-      <Filter>Core\GB APU</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\apu\blargg_config.h">
-      <Filter>Core\GB APU</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\apu\blargg_source.h">
-      <Filter>Core\GB APU</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\apu\Blip_Buffer.h">
-      <Filter>Core\GB APU</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\apu\Effects_Buffer.h">
-      <Filter>Core\GB APU</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\apu\Gb_Apu.h">
-      <Filter>Core\GB APU</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\apu\Gb_Oscs.h">
-      <Filter>Core\GB APU</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\apu\Multi_Buffer.h">
-      <Filter>Core\GB APU</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\agbprint.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\bios.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\EEprom.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\elf.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\Flash.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\gba.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\GBAcpu.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\gbagfx.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\gbainline.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\Globals.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\RTC.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\Sound.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\Sram.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\System.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\rpi.h">
-      <Filter>Pixel Filter</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\filters\hq2x.h">
-      <Filter>Pixel Filter\HQ</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\filters\interp.h">
-      <Filter>Pixel Filter\HQ</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\filters\lq2x.h">
-      <Filter>Pixel Filter\HQ</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\armdis.h">
-      <Filter>Functionality</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\Cheats.h">
-      <Filter>Functionality</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\CheatSearch.h">
-      <Filter>Functionality</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\common\memgzio.h">
-      <Filter>Functionality</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\NLS.h">
-      <Filter>Functionality</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\common\Patch.h">
-      <Filter>Functionality</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\common\Port.h">
-      <Filter>Functionality</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Util.h">
-      <Filter>Functionality</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\version.h">
-      <Filter>Functionality</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\Display.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\glfont.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\gzglfont.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\Input.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\common\SoundDriver.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\gbalink.h">
-      <Filter>Linking</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gba\GBASockClient.h">
-      <Filter>Linking</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\JoybusOptions.h">
-      <Filter>Linking</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\LinkOptions.h">
-      <Filter>Linking</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\stdafx.h">
-      <Filter>Main</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\targetver.h">
-      <Filter>Main</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\VBA.h">
-      <Filter>Main</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\AboutDialog.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\AccelEditor.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\AcceleratorManager.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\Associate.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\AudioCoreSettingsDlg.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\AVIWrite.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\BIOSDialog.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\BitmapControl.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\CmdAccelOb.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\ColorButton.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\ColorControl.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\Directories.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\Disassemble.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\ExportGSASnapshot.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\FileDlg.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\FullscreenSettings.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GBACheats.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GDBConnection.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GSACodeSelect.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\Hyperlink.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\IOViewer.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\IOViewerRegs.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\IUpdate.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\Joypad.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\KeyboardEdit.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\LangSelect.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\Logging.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\MainWnd.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\MapView.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\MaxScale.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\MemoryViewer.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\MemoryViewerAddressSize.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\MemoryViewerDlg.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\OALConfig.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\OamView.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\PaletteView.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\PaletteViewControl.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\Reg.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\ResizeDlg.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\RewindInterval.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\RomInfo.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\SelectPlugin.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\StringTokenizer.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\Throttle.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\TileView.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\WavWriter.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\WinHelper.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\WinResUtil.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\XAudio2_Config.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\ZoomControl.h">
-      <Filter>MFC</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GBCheatsDlg.h">
-      <Filter>MFC\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GBColorDlg.h">
-      <Filter>MFC\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GBDisassemble.h">
-      <Filter>MFC\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GBMapView.h">
-      <Filter>MFC\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GBMemoryViewerDlg.h">
-      <Filter>MFC\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GBOamView.h">
-      <Filter>MFC\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GBPaletteView.h">
-      <Filter>MFC\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GBPrinterDlg.h">
-      <Filter>MFC\GB</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\win32\GBTileView.h">
-      <Filter>MFC\GB</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\src\win32\res\VBA.ico">
-      <Filter>Resource</Filter>
-    </None>
-    <None Include="..\..\src\win32\res\VBA.rc2">
-      <Filter>Resource</Filter>
-    </None>
-    <None Include="..\..\doc\DevInfo.txt">
-      <Filter>Documentation</Filter>
-    </None>
-    <None Include="..\..\doc\License.txt">
-      <Filter>Documentation</Filter>
-    </None>
-    <None Include="..\..\doc\ReadMe.MFC.txt">
-      <Filter>Documentation</Filter>
-    </None>
-    <None Include="..\..\src\filters\hq\asm\macros.mac">
-      <Filter>Pixel Filter\HQ\3x_4x_asm</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\win32\VBA.rc">
-      <Filter>Resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\gb\gb.cpp">
-      <Filter>Core\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gb\gbCheats.cpp">
-      <Filter>Core\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gb\gbDis.cpp">
-      <Filter>Core\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gb\gbGfx.cpp">
-      <Filter>Core\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gb\gbGlobals.cpp">
-      <Filter>Core\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gb\gbMemory.cpp">
-      <Filter>Core\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gb\gbPrinter.cpp">
-      <Filter>Core\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gb\gbSGB.cpp">
-      <Filter>Core\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gb\gbSound.cpp">
-      <Filter>Core\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\apu\Blip_Buffer.cpp">
-      <Filter>Core\GB APU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\apu\Effects_Buffer.cpp">
-      <Filter>Core\GB APU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\apu\Gb_Apu.cpp">
-      <Filter>Core\GB APU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\apu\Gb_Apu_State.cpp">
-      <Filter>Core\GB APU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\apu\Gb_Oscs.cpp">
-      <Filter>Core\GB APU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\apu\Multi_Buffer.cpp">
-      <Filter>Core\GB APU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\agbprint.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\bios.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\EEprom.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\elf.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\Flash.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\gba-arm.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\gba-thumb.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\gba.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\gbafilter.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\gbagfx.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\Globals.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\Mode0.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\Mode1.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\Mode2.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\Mode3.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\Mode4.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\Mode5.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\remote.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\RTC.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\Sound.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\Sram.cpp">
-      <Filter>Core\GBA</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filters\2xSaI.cpp">
-      <Filter>Pixel Filter</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filters\admame.cpp">
-      <Filter>Pixel Filter</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filters\bilinear.cpp">
-      <Filter>Pixel Filter</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filters\interframe.cpp">
-      <Filter>Pixel Filter</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filters\pixel.cpp">
-      <Filter>Pixel Filter</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\rpi.cpp">
-      <Filter>Pixel Filter</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filters\scanline.cpp">
-      <Filter>Pixel Filter</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filters\simpleFilter.cpp">
-      <Filter>Pixel Filter</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filters\hq2x.cpp">
-      <Filter>Pixel Filter\HQ</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filters\hq\asm\hq3x32.cpp">
-      <Filter>Pixel Filter\HQ\3x_4x_asm</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\armdis.cpp">
-      <Filter>Functionality</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\Cheats.cpp">
-      <Filter>Functionality</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\CheatSearch.cpp">
-      <Filter>Functionality</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\memgzio.c">
-      <Filter>Functionality</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\Patch.cpp">
-      <Filter>Functionality</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\Util.cpp">
-      <Filter>Functionality</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Direct3D.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\DirectInput.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\DirectSound.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\glfont.c">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\LoadOAL.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\OpenAL.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\OpenGL.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\XAudio2.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\gbalink.cpp">
-      <Filter>Linking</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gba\GBASockClient.cpp">
-      <Filter>Linking</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\JoybusOptions.cpp">
-      <Filter>Linking</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\LinkOptions.cpp">
-      <Filter>Linking</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\stdafx.cpp">
-      <Filter>Main</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\VBA.cpp">
-      <Filter>Main</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\AboutDialog.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\AccelEditor.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\AcceleratorManager.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Associate.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\AudioCoreSettingsDlg.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\AVIWrite.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\BIOSDialog.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\BitmapControl.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\CmdAccelOb.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\ColorButton.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\ColorControl.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Commands.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Directories.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Disassemble.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\ExportGSASnapshot.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\FileDlg.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\FullscreenSettings.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GameOverrides.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBACheats.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GDBConnection.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GSACodeSelect.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Hyperlink.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\IOViewer.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Joypad.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\KeyboardEdit.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\LangSelect.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Logging.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWnd.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWndCheats.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWndFile.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWndHelp.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWndOptions.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MainWndTools.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MapView.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MaxScale.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MemoryViewer.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MemoryViewerAddressSize.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\MemoryViewerDlg.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\OALConfig.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\OamView.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\PaletteView.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\PaletteViewControl.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Reg.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\ResizeDlg.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\RewindInterval.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\RomInfo.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\SelectPlugin.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\StringTokenizer.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\Throttle.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\TileView.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\WavWriter.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\WinResUtil.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\XAudio2_Config.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\ZoomControl.cpp">
-      <Filter>MFC</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBCheatsDlg.cpp">
-      <Filter>MFC\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBColorDlg.cpp">
-      <Filter>MFC\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBDisassemble.cpp">
-      <Filter>MFC\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBMapView.cpp">
-      <Filter>MFC\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBMemoryViewerDlg.cpp">
-      <Filter>MFC\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBOamView.cpp">
-      <Filter>MFC\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBPaletteView.cpp">
-      <Filter>MFC\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBPrinterDlg.cpp">
-      <Filter>MFC\GB</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\win32\GBTileView.cpp">
-      <Filter>MFC\GB</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <NASM Include="..\..\src\filters\2xSaImmx.asm">
-      <Filter>Pixel Filter</Filter>
-    </NASM>
-    <NASM Include="..\..\src\filters\hq\asm\hq3x_16.asm">
-      <Filter>Pixel Filter\HQ\3x_4x_asm</Filter>
-    </NASM>
-    <NASM Include="..\..\src\filters\hq\asm\hq3x_32.asm">
-      <Filter>Pixel Filter\HQ\3x_4x_asm</Filter>
-    </NASM>
-    <NASM Include="..\..\src\filters\hq\asm\hq4x_16.asm">
-      <Filter>Pixel Filter\HQ\3x_4x_asm</Filter>
-    </NASM>
-    <NASM Include="..\..\src\filters\hq\asm\hq4x_32.asm">
-      <Filter>Pixel Filter\HQ\3x_4x_asm</Filter>
-    </NASM>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.vcxproj.user b/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/project/vs2010_wx_STILL_BUILDS_MFC!!/VBA2010.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file
diff --git a/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.props b/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.props
deleted file mode 100644
index 19b8e5f5..00000000
--- a/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.props
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup
-    Condition="'$(NASMBeforeTargets)' == '' and '$(NASMAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
-    <NASMBeforeTargets>Midl</NASMBeforeTargets>
-    <NASMAfterTargets>CustomBuild</NASMAfterTargets>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NASMDependsOn
-      Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(NASMDependsOn)</NASMDependsOn>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <NASM>
-      <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-      <DisableOrphanLabelsWarning>False</DisableOrphanLabelsWarning>
-      <GenerateDebugInfo>False</GenerateDebugInfo>
-      <ObjectFileName>$(IntDir)%(Filename).obj</ObjectFileName>
-      <Optimization>0</Optimization>
-      <ObjectFileFormat>8</ObjectFileFormat>
-      <ErrorReportingFormat>1</ErrorReportingFormat>
-      <CommandLineTemplate>$(SolutionDir)..\..\..\dependencies\nasm.exe [AllOptions] [AdditionalOptions] -- [inputs]</CommandLineTemplate>
-      <Outputs>%(ObjectFileName)</Outputs>
-      <ExecutionDescription>Assembling...</ExecutionDescription>
-    </NASM>
-  </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
diff --git a/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.rules b/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.rules
deleted file mode 100644
index 8ad4913f..00000000
--- a/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.rules
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="Netwide Assembler"
-	Version="8,00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="NASM"
-			DisplayName="Netwide Assembler"
-			CommandLine="$(SolutionDir)..\..\..\dependencies\nasm.exe [AllOptions] [AdditionalOptions] -- [inputs]"
-			Outputs="[$ObjectFileName]"
-			FileExtensions="*.asm"
-			ExecutionDescription="Assembling..."
-			>
-			<Properties>
-				<StringProperty
-					Name="ObjectFileName"
-					DisplayName="Object File Name"
-					Description="Specifies the name of the output object file.     (-o [file])"
-					Switch="-o &quot;[value]&quot;"
-					DefaultValue="$(IntDir)\$(InputName).obj"
-				/>
-				<EnumProperty
-					Name="Optimization"
-					DisplayName="Branch Offset Optimization"
-					Description="Optimize branch offsets.     (-O[digit])"
-					>
-					<Values>
-						<EnumValue
-							Value="0"
-							Switch="-O0"
-							DisplayName="Do not optimize (-O0)"
-						/>
-						<EnumValue
-							Value="1"
-							Switch="-O1"
-							DisplayName="Optimize (-O1)"
-						/>
-					</Values>
-				</EnumProperty>
-				<StringProperty
-					Name="IncludePath"
-					DisplayName="Include Path"
-					Description="Adds a pathname to the include file path.     (-I[path])"
-					Switch="-I&quot;[value]&quot;"
-					Delimited="true"
-				/>
-				<EnumProperty
-					Name="ObjectFileFormat"
-					DisplayName="Object File Format"
-					Description="Set the object file format.     (-f [format])"
-					DefaultValue="8"
-					>
-					<Values>
-						<EnumValue
-							Value="0"
-							Switch="-f bin"
-							DisplayName="Flat-form binary files (e.g. DOS .COM, .SYS)"
-						/>
-						<EnumValue
-							Value="1"
-							Switch="-f aout"
-							DisplayName="Linux a.out object files"
-						/>
-						<EnumValue
-							Value="2"
-							Switch="-f aoutb"
-							DisplayName="NetBSD/FreeBSD a.out object files"
-						/>
-						<EnumValue
-							Value="3"
-							Switch="-f coff"
-							DisplayName="COFF (i386) object files (e.g. DJGPP for DOS)"
-						/>
-						<EnumValue
-							Value="4"
-							Switch="-f elf32"
-							DisplayName="ELF32 (i386) object files (e.g. Linux)"
-						/>
-						<EnumValue
-							Value="5"
-							Switch="-f elf64"
-							DisplayName="ELF64 (x86_64) object files (e.g. Linux)"
-						/>
-						<EnumValue
-							Value="6"
-							Switch="-f as86"
-							DisplayName="Linux as86 (bin86 version 0.3) object files"
-						/>
-						<EnumValue
-							Value="7"
-							Switch="-f obj"
-							DisplayName="MS-DOS 16-bit/32-bit OMF object files"
-						/>
-						<EnumValue
-							Value="8"
-							Switch="-f win32"
-							DisplayName="Microsoft Win32 (i386) object files"
-						/>
-						<EnumValue
-							Value="9"
-							Switch="-f win64"
-							DisplayName="Microsoft Win64 (x86-64) object files"
-						/>
-						<EnumValue
-							Value="10"
-							Switch="-f rdf"
-							DisplayName="Relocatable Dynamic Object File Format v2.0"
-						/>
-						<EnumValue
-							Value="11"
-							Switch="-f ieee"
-							DisplayName="IEEE-695 (LADsoft variant) object file format"
-						/>
-						<EnumValue
-							Value="12"
-							Switch="-f macho"
-							DisplayName="NeXTstep/OpenStep/Rhapsody/Darwin/MacOS X object files"
-						/>
-					</Values>
-				</EnumProperty>
-				<EnumProperty
-					Name="ErrorReportingFormat"
-					DisplayName="Error Reporting Format"
-					Description="Specifies error reporting format.     (-X[format])"
-					DefaultValue="1"
-					>
-					<Values>
-						<EnumValue
-							Value="0"
-							Switch="-Xgnu"
-							DisplayName="GNU"
-						/>
-						<EnumValue
-							Value="1"
-							Switch="-Xvc"
-							DisplayName="Microsoft Visual C++"
-						/>
-					</Values>
-				</EnumProperty>
-				<BooleanProperty
-					Name="TreatWarningsAsErrors"
-					DisplayName="Treat Warnings As Errors"
-					Description="Returns an error code if warnings are generated.     (-w+error)"
-					Switch="-w+error"
-				/>
-				<BooleanProperty
-					Name="DisableOrphanLabelsWarning"
-					DisplayName="Disable Orphan Labels Warning"
-					Description="Disable warning when labels alone on lines without trailing &apos;:&apos; are found.     (-w-orphan-labels)"
-					Switch="-w-orphan-labels"
-				/>
-				<StringProperty
-					Name="PreprocessorDefinitions"
-					DisplayName="Preprocessor Definitions"
-					Description="Defines a text macro with the given name.     (-D[symbol][=value])"
-					Switch="-D[value]"
-				/>
-				<BooleanProperty
-					Name="GenerateDebugInfo"
-					DisplayName="Generate Debug Info"
-					Description="Generate debug information in selected format. (-g)"
-					Switch="-g"
-				/>
-			</Properties>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.targets b/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.targets
deleted file mode 100644
index c3107e89..00000000
--- a/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.targets
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PropertyPageSchema
-      Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
-    <AvailableItemName
-      Include="NASM">
-      <Targets>_NASM</Targets>
-    </AvailableItemName>
-  </ItemGroup>
-  <UsingTask
-    TaskName="NASM"
-    TaskFactory="XamlTaskFactory"
-    AssemblyName="Microsoft.Build.Tasks.v4.0">
-    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
-  </UsingTask>
-  <Target
-    Name="_NASM"
-    BeforeTargets="$(NASMBeforeTargets)"
-    AfterTargets="$(NASMAfterTargets)"
-    Condition="'@(NASM)' != ''"
-    DependsOnTargets="$(NASMDependsOn);ComputeNASMOutput"
-    Outputs="@(NASM-&gt;Metadata('Outputs')-&gt;Distinct())"
-    Inputs="@(NASM);%(NASM.AdditionalDependencies);$(MSBuildProjectFile)">
-    <ItemGroup
-      Condition="'@(SelectedFiles)' != ''">
-      <NASM
-        Remove="@(NASM)"
-        Condition="'%(Identity)' != '@(SelectedFiles)'" />
-    </ItemGroup>
-    <ItemGroup>
-      <NASM_tlog
-        Include="%(NASM.Outputs)"
-        Condition="'%(NASM.Outputs)' != '' and '%(NASM.ExcludedFromBuild)' != 'true'">
-        <Source>@(NASM, '|')</Source>
-      </NASM_tlog>
-    </ItemGroup>
-    <Message
-      Importance="High"
-      Text="%(NASM.ExecutionDescription)" />
-    <WriteLinesToFile
-      Condition="'@(NASM_tlog)' != '' and '%(NASM_tlog.ExcludedFromBuild)' != 'true'"
-      File="$(IntDir)$(ProjectName).write.1.tlog"
-      Lines="^%(NASM_tlog.Source);@(NASM_tlog-&gt;'%(Fullpath)')" />
-    <NASM
-      Condition="'@(NASM)' != '' and '%(NASM.ExcludedFromBuild)' != 'true'"
-      CommandLineTemplate="%(NASM.CommandLineTemplate)"
-      TreatWarningsAsErrors="%(NASM.TreatWarningsAsErrors)"
-      DisableOrphanLabelsWarning="%(NASM.DisableOrphanLabelsWarning)"
-      GenerateDebugInfo="%(NASM.GenerateDebugInfo)"
-      ObjectFileName="%(NASM.ObjectFileName)"
-      IncludePath="%(NASM.IncludePath)"
-      PreprocessorDefinitions="%(NASM.PreprocessorDefinitions)"
-      Optimization="%(NASM.Optimization)"
-      ObjectFileFormat="%(NASM.ObjectFileFormat)"
-      ErrorReportingFormat="%(NASM.ErrorReportingFormat)"
-      AdditionalOptions="%(NASM.AdditionalOptions)"
-      Inputs="@(NASM)" />
-  </Target>
-  <PropertyGroup>
-    <ComputeLinkInputsTargets>
-            $(ComputeLinkInputsTargets);
-            ComputeNASMOutput;
-          </ComputeLinkInputsTargets>
-    <ComputeLibInputsTargets>
-            $(ComputeLibInputsTargets);
-            ComputeNASMOutput;
-          </ComputeLibInputsTargets>
-  </PropertyGroup>
-  <Target
-    Name="ComputeNASMOutput"
-    Condition="'@(NASM)' != ''">
-    <ItemGroup>
-      <NASMDirsToMake
-        Condition="'@(NASM)' != '' and '%(NASM.ExcludedFromBuild)' != 'true'"
-        Include="%(NASM.Outputs)" />
-      <Link
-        Include="%(NASMDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-      <Lib
-        Include="%(NASMDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-      <ImpLib
-        Include="%(NASMDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-    </ItemGroup>
-    <MakeDir
-      Directories="@(NASMDirsToMake-&gt;'%(RootDir)%(Directory)')" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.xml b/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.xml
deleted file mode 100644
index 3297db0d..00000000
--- a/project/vs2010_wx_STILL_BUILDS_MFC!!/nasm.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
-  <Rule
-    Name="NASM"
-    PageTemplate="tool"
-    DisplayName="Netwide Assembler"
-    Order="200">
-    <Rule.DataSource>
-      <DataSource
-        Persistence="ProjectFile"
-        ItemType="NASM" />
-    </Rule.DataSource>
-    <Rule.Categories>
-      <Category
-        Name="General">
-        <Category.DisplayName>
-          <sys:String>General</sys:String>
-        </Category.DisplayName>
-      </Category>
-      <Category
-        Name="Command Line"
-        Subtype="CommandLine">
-        <Category.DisplayName>
-          <sys:String>Command Line</sys:String>
-        </Category.DisplayName>
-      </Category>
-    </Rule.Categories>
-    <StringListProperty
-      Name="Inputs"
-      Category="Command Line"
-      IsRequired="true"
-      Switch=" ">
-      <StringListProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          ItemType="NASM"
-          SourceType="Item" />
-      </StringListProperty.DataSource>
-    </StringListProperty>
-    <BoolProperty
-      Name="TreatWarningsAsErrors"
-      HelpContext="0"
-      DisplayName="Treat Warnings As Errors"
-      Description="Returns an error code if warnings are generated.     (-w+error)"
-      Switch="-w+error" />
-    <BoolProperty
-      Name="DisableOrphanLabelsWarning"
-      HelpContext="0"
-      DisplayName="Disable Orphan Labels Warning"
-      Description="Disable warning when labels alone on lines without trailing ':' are found.     (-w-orphan-labels)"
-      Switch="-w-orphan-labels" />
-    <BoolProperty
-      Name="GenerateDebugInfo"
-      HelpContext="0"
-      DisplayName="Generate Debug Info"
-      Description="Generate debug information in selected format. (-g)"
-      Switch="-g" />
-    <StringProperty
-      Name="ObjectFileName"
-      HelpContext="0"
-      DisplayName="Object File Name"
-      Description="Specifies the name of the output object file.     (-o [file])"
-      Switch="-o &quot;[value]&quot;" />
-    <StringListProperty
-      Name="IncludePath"
-      HelpContext="0"
-      DisplayName="Include Path"
-      Description="Adds a pathname to the include file path.     (-I[path])"
-      Separator=";"
-      Switch="-I&quot;[value]&quot;" />
-    <StringProperty
-      Name="PreprocessorDefinitions"
-      HelpContext="0"
-      DisplayName="Preprocessor Definitions"
-      Description="Defines a text macro with the given name.     (-D[symbol][=value])"
-      Switch="-D[value]" />
-    <EnumProperty
-      Name="Optimization"
-      HelpContext="0"
-      DisplayName="Branch Offset Optimization"
-      Description="Optimize branch offsets.     (-O[digit])">
-      <EnumValue
-        Name="0"
-        DisplayName="Do not optimize (-O0)"
-        Switch="-O0" />
-      <EnumValue
-        Name="1"
-        DisplayName="Optimize (-O1)"
-        Switch="-O1" />
-    </EnumProperty>
-    <EnumProperty
-      Name="ObjectFileFormat"
-      HelpContext="0"
-      DisplayName="Object File Format"
-      Description="Set the object file format.     (-f [format])">
-      <EnumValue
-        Name="0"
-        DisplayName="Flat-form binary files (e.g. DOS .COM, .SYS)"
-        Switch="-f bin" />
-      <EnumValue
-        Name="1"
-        DisplayName="Linux a.out object files"
-        Switch="-f aout" />
-      <EnumValue
-        Name="2"
-        DisplayName="NetBSD/FreeBSD a.out object files"
-        Switch="-f aoutb" />
-      <EnumValue
-        Name="3"
-        DisplayName="COFF (i386) object files (e.g. DJGPP for DOS)"
-        Switch="-f coff" />
-      <EnumValue
-        Name="4"
-        DisplayName="ELF32 (i386) object files (e.g. Linux)"
-        Switch="-f elf32" />
-      <EnumValue
-        Name="5"
-        DisplayName="ELF64 (x86_64) object files (e.g. Linux)"
-        Switch="-f elf64" />
-      <EnumValue
-        Name="6"
-        DisplayName="Linux as86 (bin86 version 0.3) object files"
-        Switch="-f as86" />
-      <EnumValue
-        Name="7"
-        DisplayName="MS-DOS 16-bit/32-bit OMF object files"
-        Switch="-f obj" />
-      <EnumValue
-        Name="8"
-        DisplayName="Microsoft Win32 (i386) object files"
-        Switch="-f win32" />
-      <EnumValue
-        Name="9"
-        DisplayName="Microsoft Win64 (x86-64) object files"
-        Switch="-f win64" />
-      <EnumValue
-        Name="10"
-        DisplayName="Relocatable Dynamic Object File Format v2.0"
-        Switch="-f rdf" />
-      <EnumValue
-        Name="11"
-        DisplayName="IEEE-695 (LADsoft variant) object file format"
-        Switch="-f ieee" />
-      <EnumValue
-        Name="12"
-        DisplayName="NeXTstep/OpenStep/Rhapsody/Darwin/MacOS X object files"
-        Switch="-f macho" />
-    </EnumProperty>
-    <EnumProperty
-      Name="ErrorReportingFormat"
-      HelpContext="0"
-      DisplayName="Error Reporting Format"
-      Description="Specifies error reporting format.     (-X[format])">
-      <EnumValue
-        Name="0"
-        DisplayName="GNU"
-        Switch="-Xgnu" />
-      <EnumValue
-        Name="1"
-        DisplayName="Microsoft Visual C++"
-        Switch="-Xvc" />
-    </EnumProperty>
-    <StringProperty
-      Name="CommandLineTemplate"
-      DisplayName="Command Line"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <DynamicEnumProperty
-      Name="NASMBeforeTargets"
-      Category="General"
-      EnumProvider="Targets"
-      IncludeInCommandLine="False">
-      <DynamicEnumProperty.DisplayName>
-        <sys:String>Execute Before</sys:String>
-      </DynamicEnumProperty.DisplayName>
-      <DynamicEnumProperty.Description>
-        <sys:String>Specifies the targets for the build customization to run before.</sys:String>
-      </DynamicEnumProperty.Description>
-      <DynamicEnumProperty.ProviderSettings>
-        <NameValuePair
-          Name="Exclude"
-          Value="^NASMBeforeTargets|^Compute" />
-      </DynamicEnumProperty.ProviderSettings>
-      <DynamicEnumProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          HasConfigurationCondition="true" />
-      </DynamicEnumProperty.DataSource>
-    </DynamicEnumProperty>
-    <DynamicEnumProperty
-      Name="NASMAfterTargets"
-      Category="General"
-      EnumProvider="Targets"
-      IncludeInCommandLine="False">
-      <DynamicEnumProperty.DisplayName>
-        <sys:String>Execute After</sys:String>
-      </DynamicEnumProperty.DisplayName>
-      <DynamicEnumProperty.Description>
-        <sys:String>Specifies the targets for the build customization to run after.</sys:String>
-      </DynamicEnumProperty.Description>
-      <DynamicEnumProperty.ProviderSettings>
-        <NameValuePair
-          Name="Exclude"
-          Value="^NASMAfterTargets|^Compute" />
-      </DynamicEnumProperty.ProviderSettings>
-      <DynamicEnumProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          ItemType=""
-          HasConfigurationCondition="true" />
-      </DynamicEnumProperty.DataSource>
-    </DynamicEnumProperty>
-    <StringListProperty
-      Name="Outputs"
-      DisplayName="Outputs"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <StringProperty
-      Name="ExecutionDescription"
-      DisplayName="Execution Description"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <StringListProperty
-      Name="AdditionalDependencies"
-      DisplayName="Additional Dependencies"
-      IncludeInCommandLine="False"
-      Visible="false" />
-    <StringProperty
-      Subtype="AdditionalOptions"
-      Name="AdditionalOptions"
-      Category="Command Line">
-      <StringProperty.DisplayName>
-        <sys:String>Additional Options</sys:String>
-      </StringProperty.DisplayName>
-      <StringProperty.Description>
-        <sys:String>Additional Options</sys:String>
-      </StringProperty.Description>
-    </StringProperty>
-  </Rule>
-  <ItemType
-    Name="NASM"
-    DisplayName="Netwide Assembler" />
-  <FileExtension
-    Name="*.asm"
-    ContentType="NASM" />
-  <ContentType
-    Name="NASM"
-    DisplayName="Netwide Assembler"
-    ItemType="NASM" />
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/project/vs2010_wx_STILL_BUILDS_MFC!!/per_user_settings.props b/project/vs2010_wx_STILL_BUILDS_MFC!!/per_user_settings.props
deleted file mode 100644
index 3b7d34fb..00000000
--- a/project/vs2010_wx_STILL_BUILDS_MFC!!/per_user_settings.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/project/vs2010_wx_STILL_BUILDS_MFC!!/svnrev_template.h b/project/vs2010_wx_STILL_BUILDS_MFC!!/svnrev_template.h
deleted file mode 100644
index 24d8c760..00000000
--- a/project/vs2010_wx_STILL_BUILDS_MFC!!/svnrev_template.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SVN_REV $WCREV$
-#define SVN_REV_STR "$WCREV$"