Remove hand-crafted Visual Studio solution.

27 files changed, 1 insertions, 2970 deletions

diff --git a/.gitignore b/.gitignore
index 001894c3..cc8abe9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,5 @@
-# Compiled Object files
-*.slo
-*.lo
-*.o
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-
-# MSVS generated files
-ipch/
-*.suo
-*.user
-*.sdf
-*.opensdf
-
-# Build generated files
+# Build directory
 build/
-bin/
 
 # Generated source files
 src/common/scm_rev.cpp
-
-# Generated header files
-src/citra_qt/ui_*.h
diff --git a/citra.sln b/citra.sln
deleted file mode 100644
index af1f1ee5..00000000
--- a/citra.sln
+++ /dev/null
@@ -1,87 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "src\common\common.vcxproj", "{DFE335FC-755D-4BAA-8452-94434F8A1EDB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "citra", "src\citra\citra.vcxproj", "{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
-		{6678D1A3-33A6-48A9-878B-48E5D2903D27} = {6678D1A3-33A6-48A9-878B-48E5D2903D27}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "src\core\core.vcxproj", "{8AEA7F29-3466-4786-A10D-6A4BD0610977}"
-	ProjectSection(ProjectDependencies) = postProject
-		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scm_rev_gen", "src\common\scm_rev_gen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "citra_qt", "src\citra_qt\citra_qt.vcxproj", "{A587F714-490F-407A-9E36-7AB7FA0D7BAB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video_core", "src\video_core\video_core.vcxproj", "{6678D1A3-33A6-48A9-878B-48E5D2903D27}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|Win32.Build.0 = Debug|Win32
-		{DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|x64.ActiveCfg = Debug|x64
-		{DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|x64.Build.0 = Debug|x64
-		{DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|Win32.ActiveCfg = Release|Win32
-		{DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|Win32.Build.0 = Release|Win32
-		{DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|x64.ActiveCfg = Release|x64
-		{DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|x64.Build.0 = Release|x64
-		{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|Win32.Build.0 = Debug|Win32
-		{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|x64.ActiveCfg = Debug|x64
-		{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|x64.Build.0 = Debug|x64
-		{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|Win32.ActiveCfg = Release|Win32
-		{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|Win32.Build.0 = Release|Win32
-		{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|x64.ActiveCfg = Release|x64
-		{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|x64.Build.0 = Release|x64
-		{8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|Win32.Build.0 = Debug|Win32
-		{8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|x64.ActiveCfg = Debug|x64
-		{8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|x64.Build.0 = Debug|x64
-		{8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|Win32.ActiveCfg = Release|Win32
-		{8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|Win32.Build.0 = Release|Win32
-		{8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|x64.ActiveCfg = Release|x64
-		{8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|x64.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Debug|Win32
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Debug|Win32
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|Win32
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|Win32
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64
-		{A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Debug|Win32.Build.0 = Debug|Win32
-		{A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Debug|x64.ActiveCfg = Debug|x64
-		{A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Debug|x64.Build.0 = Debug|x64
-		{A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Release|Win32.ActiveCfg = Release|Win32
-		{A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Release|Win32.Build.0 = Release|Win32
-		{A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Release|x64.ActiveCfg = Release|x64
-		{A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Release|x64.Build.0 = Release|x64
-		{6678D1A3-33A6-48A9-878B-48E5D2903D27}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6678D1A3-33A6-48A9-878B-48E5D2903D27}.Debug|Win32.Build.0 = Debug|Win32
-		{6678D1A3-33A6-48A9-878B-48E5D2903D27}.Debug|x64.ActiveCfg = Debug|x64
-		{6678D1A3-33A6-48A9-878B-48E5D2903D27}.Debug|x64.Build.0 = Debug|x64
-		{6678D1A3-33A6-48A9-878B-48E5D2903D27}.Release|Win32.ActiveCfg = Release|Win32
-		{6678D1A3-33A6-48A9-878B-48E5D2903D27}.Release|Win32.Build.0 = Release|Win32
-		{6678D1A3-33A6-48A9-878B-48E5D2903D27}.Release|x64.ActiveCfg = Release|x64
-		{6678D1A3-33A6-48A9-878B-48E5D2903D27}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj
deleted file mode 100644
index bda1ed07..00000000
--- a/src/citra/citra.vcxproj
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>emu_win32</RootNamespace>
-    <ProjectName>citra</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\app.props" />
-    <Import Project="..\..\vsprops\optimization_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\app.props" />
-    <Import Project="..\..\vsprops\optimization_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\app.props" />
-    <Import Project="..\..\vsprops\optimization_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\app.props" />
-    <Import Project="..\..\vsprops\optimization_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <CustomBuildBeforeTargets>
-    </CustomBuildBeforeTargets>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <CustomBuildBeforeTargets />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link />
-    <CustomBuildStep>
-      <Outputs>
-      </Outputs>
-      <Command>
-      </Command>
-    </CustomBuildStep>
-    <PreBuildEvent />
-    <Link />
-    <Link>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link />
-    <CustomBuildStep>
-      <Outputs>
-      </Outputs>
-      <Command>
-      </Command>
-    </CustomBuildStep>
-    <PreBuildEvent />
-    <Link>
-      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;msvcrt.lib</IgnoreSpecificDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SpecifySectionAttributes>
-      </SpecifySectionAttributes>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-    </Link>
-    <CustomBuildStep>
-      <Command>
-      </Command>
-    </CustomBuildStep>
-    <CustomBuildStep>
-      <Message>
-      </Message>
-    </CustomBuildStep>
-    <CustomBuildStep>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <PreBuildEvent />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SpecifySectionAttributes>
-      </SpecifySectionAttributes>
-      <IgnoreAllDefaultLibraries>
-      </IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <CustomBuildStep>
-      <Command>
-      </Command>
-    </CustomBuildStep>
-    <CustomBuildStep>
-      <Message>
-      </Message>
-    </CustomBuildStep>
-    <CustomBuildStep>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <PreBuildEvent />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\common\common.vcxproj">
-      <Project>{dfe335fc-755d-4baa-8452-94434f8a1edb}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <ProjectReference Include="..\core\core.vcxproj">
-      <Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <ProjectReference Include="..\video_core\video_core.vcxproj">
-      <Project>{6678d1a3-33a6-48a9-878b-48e5d2903d27}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="citra.cpp" />
-    <ClCompile Include="emu_window\emu_window_glfw.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="emu_window\emu_window_glfw.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters
deleted file mode 100644
index 78954670..00000000
--- a/src/citra/citra.vcxproj.filters
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="emu_window">
-      <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="citra.cpp" />
-    <ClCompile Include="emu_window\emu_window_glfw.cpp">
-      <Filter>emu_window</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="emu_window\emu_window_glfw.h">
-      <Filter>emu_window</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-</Project>
diff --git a/src/citra_qt/citra_qt.vcxproj b/src/citra_qt/citra_qt.vcxproj
deleted file mode 100644
index 746c12a5..00000000
--- a/src/citra_qt/citra_qt.vcxproj
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A587F714-490F-407A-9E36-7AB7FA0D7BAB}</ProjectGuid>
-    <RootNamespace>citra_qt</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="qt-build.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\qt.props" />
-    <Import Project="..\..\vsprops\qt_libs_debug.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\app.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\qt.props" />
-    <Import Project="..\..\vsprops\qt_libs_debug.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\app.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\qt.props" />
-    <Import Project="..\..\vsprops\qt_libs_release.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\app.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\qt.props" />
-    <Import Project="..\..\vsprops\qt_libs_release.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\app.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile />
-    <Link>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-    </Link>
-    <MOC />
-    <UIC />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile />
-    <Link>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-    </Link>
-    <MOC />
-    <UIC />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile />
-    <Link />
-    <UIC />
-    <UIC />
-    <MOC />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link />
-    <UIC />
-    <UIC />
-    <MOC />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\externals\qhexedit\commands.cpp" />
-    <ClCompile Include="..\..\externals\qhexedit\qhexedit.cpp" />
-    <ClCompile Include="..\..\externals\qhexedit\qhexedit_p.cpp" />
-    <ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp" />
-    <ClCompile Include="config\controller_config.cpp" />
-    <ClCompile Include="config\controller_config_util.cpp" />
-    <ClCompile Include="debugger\callstack.cpp" />
-    <ClCompile Include="debugger\graphics.cpp" />
-    <ClCompile Include="debugger\graphics_cmdlists.cpp" />
-    <ClCompile Include="debugger\registers.cpp" />
-    <ClCompile Include="debugger\disassembler.cpp" />
-    <ClCompile Include="debugger\ramview.cpp" />
-    <ClCompile Include="bootmanager.cpp" />
-    <ClCompile Include="hotkeys.cpp" />
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <MOC Include="..\..\externals\qhexedit\commands.h" />
-    <MOC Include="..\..\externals\qhexedit\qhexedit.h" />
-    <MOC Include="..\..\externals\qhexedit\qhexedit_p.h" />
-    <MOC Include="..\..\externals\qhexedit\xbytearray.h" />
-    <MOC Include="debugger\callstack.hxx" />
-    <MOC Include="debugger\disassembler.hxx" />
-    <MOC Include="debugger\graphics.hxx" />
-    <MOC Include="debugger\graphics_cmdlists.hxx" />
-    <MOC Include="debugger\ramview.hxx" />
-    <MOC Include="debugger\registers.hxx" />
-    <MOC Include="bootmanager.hxx" />
-    <MOC Include="hotkeys.hxx" />
-    <MOC Include="main.hxx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\common\common.vcxproj">
-      <Project>{dfe335fc-755d-4baa-8452-94434f8a1edb}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\core\core.vcxproj">
-      <Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\video_core\video_core.vcxproj">
-      <Project>{6678d1a3-33a6-48a9-878b-48e5d2903d27}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="config\controller_config.hxx" />
-    <ClInclude Include="config\controller_config_util.hxx" />
-    <ClInclude Include="version.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <UIC Include="config\controller_config.ui" />
-    <UIC Include="debugger\callstack.ui" />
-    <UIC Include="debugger\registers.ui" />
-    <UIC Include="debugger\disassembler.ui" />
-    <UIC Include="hotkeys.ui" />
-    <UIC Include="main.ui" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="qt-build.targets" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/citra_qt/citra_qt.vcxproj.filters b/src/citra_qt/citra_qt.vcxproj.filters
deleted file mode 100644
index 8f699e50..00000000
--- a/src/citra_qt/citra_qt.vcxproj.filters
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="qhexedit">
-      <UniqueIdentifier>{dede739c-939b-4147-9e72-4a326b97d237}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="config">
-      <UniqueIdentifier>{80178741-d3ab-4031-892c-ec58490ea8bf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="debugger">
-      <UniqueIdentifier>{9495d0e7-87d6-4fe1-92f1-cfa1bbec7025}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\externals\qhexedit\commands.cpp">
-      <Filter>qhexedit</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\externals\qhexedit\qhexedit.cpp">
-      <Filter>qhexedit</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\externals\qhexedit\qhexedit_p.cpp">
-      <Filter>qhexedit</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp">
-      <Filter>qhexedit</Filter>
-    </ClCompile>
-    <ClCompile Include="bootmanager.cpp" />
-    <ClCompile Include="hotkeys.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="config\controller_config.cpp">
-      <Filter>config</Filter>
-    </ClCompile>
-    <ClCompile Include="config\controller_config_util.cpp">
-      <Filter>config</Filter>
-    </ClCompile>
-    <ClCompile Include="debugger\callstack.cpp">
-      <Filter>debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="debugger\disassembler.cpp">
-      <Filter>debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="debugger\graphics.cpp">
-      <Filter>debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="debugger\graphics_cmdlists.cpp">
-      <Filter>debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="debugger\ramview.cpp">
-      <Filter>debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="debugger\registers.cpp">
-      <Filter>debugger</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <MOC Include="..\..\externals\qhexedit\commands.h">
-      <Filter>qhexedit</Filter>
-    </MOC>
-    <MOC Include="..\..\externals\qhexedit\xbytearray.h">
-      <Filter>qhexedit</Filter>
-    </MOC>
-    <MOC Include="..\..\externals\qhexedit\qhexedit_p.h">
-      <Filter>qhexedit</Filter>
-    </MOC>
-    <MOC Include="..\..\externals\qhexedit\qhexedit.h">
-      <Filter>qhexedit</Filter>
-    </MOC>
-    <MOC Include="bootmanager.hxx" />
-    <MOC Include="hotkeys.hxx" />
-    <MOC Include="main.hxx" />
-    <MOC Include="debugger\callstack.hxx">
-      <Filter>debugger</Filter>
-    </MOC>
-    <MOC Include="debugger\disassembler.hxx">
-      <Filter>debugger</Filter>
-    </MOC>
-    <MOC Include="debugger\graphics.hxx">
-      <Filter>debugger</Filter>
-    </MOC>
-    <MOC Include="debugger\graphics_cmdlists.hxx">
-      <Filter>debugger</Filter>
-    </MOC>
-    <MOC Include="debugger\ramview.hxx">
-      <Filter>debugger</Filter>
-    </MOC>
-    <MOC Include="debugger\registers.hxx">
-      <Filter>debugger</Filter>
-    </MOC>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="version.h" />
-    <ClInclude Include="config\controller_config.hxx">
-      <Filter>config</Filter>
-    </ClInclude>
-    <ClInclude Include="config\controller_config_util.hxx">
-      <Filter>config</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <UIC Include="hotkeys.ui" />
-    <UIC Include="main.ui" />
-    <UIC Include="config\controller_config.ui">
-      <Filter>config</Filter>
-    </UIC>
-    <UIC Include="debugger\callstack.ui">
-      <Filter>debugger</Filter>
-    </UIC>
-    <UIC Include="debugger\disassembler.ui">
-      <Filter>debugger</Filter>
-    </UIC>
-    <UIC Include="debugger\registers.ui">
-      <Filter>debugger</Filter>
-    </UIC>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/citra_qt/qt-build.props b/src/citra_qt/qt-build.props
deleted file mode 100644
index b6a5025f..00000000
--- a/src/citra_qt/qt-build.props
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Daher Alfawares
-Licensed under GPLv2
-Refer to the license.txt file included.
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup
-    Condition="'$(UICBeforeTargets)' == '' and '$(UICAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
-    <UICBeforeTargets>Midl</UICBeforeTargets>
-    <UICAfterTargets>CustomBuild</UICAfterTargets>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <UIC>
-      <QtUicExt>.hpp</QtUicExt>
-      <QtUicPrefix>ui_</QtUicPrefix>
-      <CommandLineTemplate>$(QTDIR)\bin\uic.exe [inputs] -o "[QtUicPrefix]%(FileName)[QtUicExt]"</CommandLineTemplate>
-      <Outputs>[QtUicPrefix]%(FileName)[QtUicExt]</Outputs>
-      <ExecutionDescription>%(FileName).ui</ExecutionDescription>
-    </UIC>
-  </ItemDefinitionGroup>
-  <PropertyGroup
-    Condition="'$(MOCBeforeTargets)' == '' and '$(MOCAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
-    <MOCBeforeTargets>Midl</MOCBeforeTargets>
-    <MOCAfterTargets>CustomBuild</MOCAfterTargets>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <MOC>
-      <QtShared>true</QtShared>
-      <QtThread>true</QtThread>
-      <QtUnicode>true</QtUnicode>
-      <QtLargeFile>true</QtLargeFile>
-      <QtKeywords>true</QtKeywords>
-      <QtNoDebug>true</QtNoDebug>
-      <QtGuiLib>true</QtGuiLib>
-      <QtCoreLib>true</QtCoreLib>
-      <QtOpenGLLib>False</QtOpenGLLib>
-      <QtMocNoWarnings>False</QtMocNoWarnings>
-      <QtMocPfx>_moc</QtMocPfx>
-      <QtMocFilename>%(FileName)%(QtMocPfx)</QtMocFilename>
-      <CommandLineTemplate>$(QTDIR)\bin\moc.exe [QtMocNoWarnings] [QtCoreLib] [QtShared] [QtThread] [QtUnicode] [QtLargeFile] [QtKeywords] [QtOpenGLLib] [QtNoDebug] [QtGuiLib] -DWIN32 -D_MSC_VER=1500 -DWIN32 [Inputs] -o$(IntDir)%(QtMocFilename).cpp &amp;&amp; cl.exe $(IntDir)%(QtMocFilename).cpp [QtCommandLine] /c /Fo"$(IntDir)%(QtMocFilename).obj"</CommandLineTemplate>
-      <Outputs>$(IntDir)%(QtMocFilename).obj</Outputs>
-      <ExecutionDescription>%(FileName).hxx</ExecutionDescription>
-      <ShowOnlyRuleProperties>true</ShowOnlyRuleProperties>
-    </MOC>
-  </ItemDefinitionGroup>
-  <PropertyGroup
-    Condition="'$(QRCBeforeTargets)' == '' and '$(QRCAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
-    <QRCBeforeTargets>Midl</QRCBeforeTargets>
-    <QRCAfterTargets>CustomBuild</QRCAfterTargets>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <QRC>
-      <QtQrcPfx>_qrc</QtQrcPfx>
-      <QtQrcFileName>%(FileName)%(QtQrcPfx)</QtQrcFileName>
-      <CommandLineTemplate>%QTDIR%\bin\rcc.exe [inputs] -o $(IntDir)%(QtQrcFileName).cpp &amp;&amp; cl.exe $(IntDir)%(QtQrcFileName).cpp /c /Fo"$(IntDir)%(QtQrcFileName)" [QtCommandLine]</CommandLineTemplate>
-      <Outputs>$(IntDir)%(QtQrcFileName).obj</Outputs>
-      <ExecutionDescription>%(FileName).qrc</ExecutionDescription>
-    </QRC>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/src/citra_qt/qt-build.targets b/src/citra_qt/qt-build.targets
deleted file mode 100644
index d0ae0d64..00000000
--- a/src/citra_qt/qt-build.targets
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Daher Alfawares
-Licensed under GPLv2
-Refer to the license.txt file included.
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PropertyPageSchema
-      Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
-    <AvailableItemName
-      Include="UIC">
-      <Targets>_UIC</Targets>
-    </AvailableItemName>
-    <AvailableItemName
-      Include="MOC">
-      <Targets>_MOC</Targets>
-    </AvailableItemName>
-    <AvailableItemName
-      Include="QRC">
-      <Targets>_QRC</Targets>
-    </AvailableItemName>
-  </ItemGroup>
-  <UsingTask
-    TaskName="UIC"
-    TaskFactory="XamlTaskFactory"
-    AssemblyName="Microsoft.Build.Tasks.v4.0">
-    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
-  </UsingTask>
-  <UsingTask
-    TaskName="MOC"
-    TaskFactory="XamlTaskFactory"
-    AssemblyName="Microsoft.Build.Tasks.v4.0">
-    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
-  </UsingTask>
-  <UsingTask
-    TaskName="QRC"
-    TaskFactory="XamlTaskFactory"
-    AssemblyName="Microsoft.Build.Tasks.v4.0">
-    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
-  </UsingTask>
-  <Target
-    Name="_UIC"
-    BeforeTargets="$(UICBeforeTargets)"
-    AfterTargets="$(UICAfterTargets)"
-    Condition="'@(UIC)' != ''"
-    DependsOnTargets="_SelectedFiles;ComputeUICOutput"
-    Outputs="%(UIC.Outputs)"
-    Inputs="%(UIC.Identity);%(UIC.AdditionalDependencies);$(MSBuildProjectFile)">
-    <ItemGroup
-      Condition="'@(SelectedFiles)' != ''">
-      <UIC
-        Remove="@(UIC)"
-        Condition="'%(Identity)' != '@(SelectedFiles)'" />
-    </ItemGroup>
-    <ItemGroup>
-      <UIC_tlog
-        Include="%(UIC.Outputs)"
-        Condition="'%(UIC.Outputs)' != '' and '%(UIC.ExcludedFromBuild)' != 'true'">
-        <Source>@(UIC, '|')</Source>
-      </UIC_tlog>
-    </ItemGroup>
-    <Message
-      Importance="High"
-      Text="%(UIC.ExecutionDescription)" />
-    <WriteLinesToFile
-      File="$(IntDir)$(ProjectName).write.1.tlog"
-      Lines="^%(UIC_tlog.Source);@(UIC_tlog-&gt;'%(Fullpath)')" />
-    <UIC
-      Condition="'%(UIC.ExcludedFromBuild)' != 'true'"
-      CommandLineTemplate="%(UIC.CommandLineTemplate)"
-      QtUicExt="%(UIC.QtUicExt)"
-      QtUicPrefix="%(UIC.QtUicPrefix)"
-      AdditionalOptions="%(UIC.AdditionalOptions)"
-      Inputs="%(UIC.Identity)" />
-  </Target>
-  <PropertyGroup>
-    <ComputeLinkInputsTargets>
-            $(ComputeLinkInputsTargets);
-            ComputeUICOutput;
-          </ComputeLinkInputsTargets>
-    <ComputeLibInputsTargets>
-            $(ComputeLibInputsTargets);
-            ComputeUICOutput;
-          </ComputeLibInputsTargets>
-  </PropertyGroup>
-  <Target
-    Name="ComputeUICOutput"
-    Condition="'@(UIC)' != ''">
-    <ItemGroup>
-      <UICDirsToMake
-        Condition="'@(UIC)' != ''"
-        Include="%(UIC.Outputs)" />
-      <Link
-        Include="%(UICDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-      <Lib
-        Include="%(UICDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-      <ImpLib
-        Include="%(UICDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-    </ItemGroup>
-    <MakeDir
-      Directories="@(UICDirsToMake-&gt;'%(RootDir)%(Directory)')" />
-  </Target>
-  <Target
-    Name="_MOC"
-    BeforeTargets="$(MOCBeforeTargets)"
-    AfterTargets="$(MOCAfterTargets)"
-    Condition="'@(MOC)' != ''"
-    DependsOnTargets="_SelectedFiles;ComputeMOCOutput"
-    Outputs="%(MOC.Outputs)"
-    Inputs="%(MOC.Identity);%(MOC.AdditionalDependencies);$(MSBuildProjectFile)">
-    <ItemGroup
-      Condition="'@(SelectedFiles)' != ''">
-      <MOC
-        Remove="@(MOC)"
-        Condition="'%(Identity)' != '@(SelectedFiles)'" />
-    </ItemGroup>
-    <ItemGroup>
-      <MOC_tlog
-        Include="%(MOC.Outputs)"
-        Condition="'%(MOC.Outputs)' != '' and '%(MOC.ExcludedFromBuild)' != 'true'">
-        <Source>@(MOC, '|')</Source>
-      </MOC_tlog>
-    </ItemGroup>
-    <Message
-      Importance="High"
-      Text="%(MOC.ExecutionDescription)" />
-    <WriteLinesToFile
-      File="$(IntDir)$(ProjectName).write.1.tlog"
-      Lines="^%(MOC_tlog.Source);@(MOC_tlog-&gt;'%(Fullpath)')" />
-    <MOC
-      Condition="'%(MOC.ExcludedFromBuild)' != 'true'"
-      CommandLineTemplate="%(MOC.CommandLineTemplate)"
-      QtShared="%(MOC.QtShared)"
-      QtThread="%(MOC.QtThread)"
-      QtUnicode="%(MOC.QtUnicode)"
-      QtLargeFile="%(MOC.QtLargeFile)"
-      QtKeywords="%(MOC.QtKeywords)"
-      QtNoDebug="%(MOC.QtNoDebug)"
-      QtGuiLib="%(MOC.QtGuiLib)"
-      QtCoreLib="%(MOC.QtCoreLib)"
-      QtOpenGLLib="%(MOC.QtOpenGLLib)"
-      QtMocNoWarnings="%(MOC.QtMocNoWarnings)"
-      QtMocPfx="%(MOC.QtMocPfx)"
-      QtCommandLine="%(MOC.QtCommandLine)"
-      AdditionalOptions="%(MOC.AdditionalOptions)"
-      Inputs="%(MOC.Identity)" />
-  </Target>
-  <PropertyGroup>
-    <ComputeLinkInputsTargets>
-            $(ComputeLinkInputsTargets);
-            ComputeMOCOutput;
-          </ComputeLinkInputsTargets>
-    <ComputeLibInputsTargets>
-            $(ComputeLibInputsTargets);
-            ComputeMOCOutput;
-          </ComputeLibInputsTargets>
-  </PropertyGroup>
-  <Target
-    Name="ComputeMOCOutput"
-    Condition="'@(MOC)' != ''">
-    <ItemGroup>
-      <MOCDirsToMake
-        Condition="'@(MOC)' != ''"
-        Include="%(MOC.Outputs)" />
-      <Link
-        Include="%(MOCDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-      <Lib
-        Include="%(MOCDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-      <ImpLib
-        Include="%(MOCDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-    </ItemGroup>
-    <MakeDir
-      Directories="@(MOCDirsToMake-&gt;'%(RootDir)%(Directory)')" />
-  </Target>
-  <Target
-    Name="_QRC"
-    BeforeTargets="$(QRCBeforeTargets)"
-    AfterTargets="$(QRCAfterTargets)"
-    Condition="'@(QRC)' != ''"
-    DependsOnTargets="_SelectedFiles;ComputeQRCOutput"
-    Outputs="%(QRC.Outputs)"
-    Inputs="%(QRC.Identity);%(QRC.AdditionalDependencies);$(MSBuildProjectFile)">
-    <ItemGroup
-      Condition="'@(SelectedFiles)' != ''">
-      <QRC
-        Remove="@(QRC)"
-        Condition="'%(Identity)' != '@(SelectedFiles)'" />
-    </ItemGroup>
-    <ItemGroup>
-      <QRC_tlog
-        Include="%(QRC.Outputs)"
-        Condition="'%(QRC.Outputs)' != '' and '%(QRC.ExcludedFromBuild)' != 'true'">
-        <Source>@(QRC, '|')</Source>
-      </QRC_tlog>
-    </ItemGroup>
-    <Message
-      Importance="High"
-      Text="%(QRC.ExecutionDescription)" />
-    <WriteLinesToFile
-      File="$(IntDir)$(ProjectName).write.1.tlog"
-      Lines="^%(QRC_tlog.Source);@(QRC_tlog-&gt;'%(Fullpath)')" />
-    <QRC
-      Condition="'%(QRC.ExcludedFromBuild)' != 'true'"
-      CommandLineTemplate="%(QRC.CommandLineTemplate)"
-      QtCommandLine="%(QRC.QtCommandLine)"
-      QtQrcPfx="%(QRC.QtQrcPfx)"
-      AdditionalOptions="%(QRC.AdditionalOptions)"
-      Inputs="%(QRC.Identity)" />
-  </Target>
-  <PropertyGroup>
-    <ComputeLinkInputsTargets>
-            $(ComputeLinkInputsTargets);
-            ComputeQRCOutput;
-          </ComputeLinkInputsTargets>
-    <ComputeLibInputsTargets>
-            $(ComputeLibInputsTargets);
-            ComputeQRCOutput;
-          </ComputeLibInputsTargets>
-  </PropertyGroup>
-  <Target
-    Name="ComputeQRCOutput"
-    Condition="'@(QRC)' != ''">
-    <ItemGroup>
-      <QRCDirsToMake
-        Condition="'@(QRC)' != ''"
-        Include="%(QRC.Outputs)" />
-      <Link
-        Include="%(QRCDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-      <Lib
-        Include="%(QRCDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-      <ImpLib
-        Include="%(QRCDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-    </ItemGroup>
-    <MakeDir
-      Directories="@(QRCDirsToMake-&gt;'%(RootDir)%(Directory)')" />
-  </Target>
-</Project>
diff --git a/src/citra_qt/qt-build.xml b/src/citra_qt/qt-build.xml
deleted file mode 100644
index 7a69f5a8..00000000
--- a/src/citra_qt/qt-build.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Daher Alfawares
-Licensed under GPLv2
-Refer to the license.txt file included.
--->
-<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" xmlns:impl="clr-namespace:Microsoft.VisualStudio.Project.Contracts.Implementation;assembly=Microsoft.VisualStudio.Project.Contracts.Implementation">
-  <Rule
-    Name="UIC"
-    PageTemplate="tool"
-    DisplayName="Qt UI Compiler"
-    Order="200">
-    <Rule.DataSource>
-      <DataSource
-        Persistence="ProjectFile"
-        ItemType="UIC" />
-    </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="UIC"
-          SourceType="Item" />
-      </StringListProperty.DataSource>
-    </StringListProperty>
-    <StringProperty
-      Name="QtUicExt"
-      Subcategory="Output"
-      HelpContext="0"
-      HelpUrl="http://code.google.com/p/xr-qt-msvc/"
-      DisplayName="UI Header file extension"
-      Description="The header file extension generated by the UIC Compiler. (Example: .h)"
-      Switch="[value]" />
-    <StringProperty
-      Name="QtUicPrefix"
-      Subcategory="Output"
-      HelpContext="0"
-      HelpUrl="http://code.google.com/p/xr-qt-msvc/"
-      DisplayName="UI Header file prefix"
-      Description="The prefix string to be used for UIC output. ( usually ui_ )"
-      Switch="[value]" />
-    <StringProperty
-      Name="CommandLineTemplate"
-      DisplayName="Command Line"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <DynamicEnumProperty
-      Name="UICBeforeTargets"
-      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="^UICBeforeTargets|^Compute" />
-      </DynamicEnumProperty.ProviderSettings>
-      <DynamicEnumProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          HasConfigurationCondition="true" />
-      </DynamicEnumProperty.DataSource>
-    </DynamicEnumProperty>
-    <DynamicEnumProperty
-      Name="UICAfterTargets"
-      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="^UICAfterTargets|^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="UIC"
-    DisplayName="Qt UI Compiler" />
-  <FileExtension
-    Name="*.ui"
-    ContentType="UIC" />
-  <ContentType
-    Name="UIC"
-    DisplayName="Qt UI Compiler"
-    ItemType="UIC" />
-  <Rule
-    Name="MOC"
-    PageTemplate="tool"
-    DisplayName="Qt Meta Object Compiler"
-    Order="200">
-    <Rule.DataSource>
-      <DataSource
-        Persistence="ProjectFile"
-        ItemType="MOC" />
-    </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="MOC"
-          SourceType="Item" />
-      </StringListProperty.DataSource>
-    </StringListProperty>
-    <BoolProperty
-      Name="QtShared"
-      Subcategory="Moc Definitions"
-      HelpContext="0"
-      DisplayName="Use QT as a Shared Library?"
-      Description="Use QT as a Shared Library?"
-      Switch="-DQT_SHARED" />
-    <BoolProperty
-      Name="QtThread"
-      Subcategory="Moc Definitions"
-      HelpContext="0"
-      DisplayName="Multi-threaded Support?"
-      Switch="-DQT_THREAD_SUPPORT" />
-    <BoolProperty
-      Name="QtUnicode"
-      Subcategory="Moc Definitions"
-      HelpContext="0"
-      DisplayName="Unicode Support?"
-      Switch="-DUNICODE" />
-    <BoolProperty
-      Name="QtLargeFile"
-      Subcategory="Moc Definitions"
-      HelpContext="0"
-      DisplayName="Large File Support?"
-      Switch="-DQT_LARGEFILE_SUPPORT" />
-    <BoolProperty
-      Name="QtKeywords"
-      Subcategory="Moc Definitions"
-      HelpContext="0"
-      DisplayName="Disable QT Keywords."
-      Description="If QT_NO_KEYWORDS is defined, &quot;signals&quot;, &quot;slots&quot; and &quot;emit&quot; are not defined, thus increasing the interoperability with other toolkits by avoiding some common name clashes. However, the SIGNAL() and SLOT() macros are still defined, which may cause name clashes still."
-      Switch="-DQT_NO_KEYWORDS" />
-    <BoolProperty
-      Name="QtNoDebug"
-      Subcategory="Moc Definitions"
-      HelpContext="0"
-      DisplayName="Disable QT Debuging"
-      Switch="-DQT_NO_DEBUG" />
-    <BoolProperty
-      Name="QtGuiLib"
-      Subcategory="QT Libraries"
-      HelpContext="0"
-      DisplayName="Use QT Gui Library"
-      Switch="-DQT_GUI_LIB" />
-    <BoolProperty
-      Name="QtCoreLib"
-      Subcategory="QT Libraries"
-      HelpContext="0"
-      DisplayName="Use QT Core Library"
-      Switch="-DQT_CORE_LIB" />
-    <BoolProperty
-      Name="QtOpenGLLib"
-      Subcategory="QT Libraries"
-      HelpContext="0"
-      DisplayName="Use QT OpenGL Library"
-      Switch="-DQT_OPENGL_LIB" />
-    <BoolProperty
-      Name="QtMocNoWarnings"
-      Subcategory="General"
-      HelpContext="0"
-      DisplayName="Do not display warnings"
-      Description="do not display warnings"
-      Switch="/nw" />
-    <StringProperty
-      Name="QtMocPfx"
-      Subcategory="Output"
-      HelpContext="0"
-      HelpUrl="http://code.google.com/p/xr-qt-msvc/"
-      DisplayName="Output file postfix"
-      Description="A postfix is added to the source and object files generated to prevent conflict with your source files. [Example: _moc leads to a.hxx -&gt; a_moc.cpp]"
-      Switch="[value]" />
-    <StringProperty
-      Name="QtCommandLine"
-      Subcategory="General"
-      HelpContext="0"
-      HelpUrl="http://code.google.com/p/xr-qt-msvc/"
-      DisplayName="C++ Command Line Options"
-      Description="Copy the command line options from your C/C++ section to match the qt compilation with your setup. Make sure you remove the /Fo option, for more details refer to the documentation."
-      Switch="[value]" />
-    <StringProperty
-      Name="CommandLineTemplate"
-      DisplayName="Command Line"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <DynamicEnumProperty
-      Name="MOCBeforeTargets"
-      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="^MOCBeforeTargets|^Compute" />
-      </DynamicEnumProperty.ProviderSettings>
-      <DynamicEnumProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          HasConfigurationCondition="true" />
-      </DynamicEnumProperty.DataSource>
-    </DynamicEnumProperty>
-    <DynamicEnumProperty
-      Name="MOCAfterTargets"
-      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="^MOCAfterTargets|^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="MOC"
-    DisplayName="Qt Meta Object Compiler" />
-  <FileExtension
-    Name="*.hxx"
-    ContentType="MOC" />
-  <ContentType
-    Name="MOC"
-    DisplayName="Qt Meta Object Compiler"
-    ItemType="MOC" />
-  <Rule
-    Name="QRC"
-    PageTemplate="tool"
-    DisplayName="Qt Resource Compiler"
-    Order="200">
-    <Rule.DataSource>
-      <DataSource
-        Persistence="ProjectFile"
-        ItemType="QRC" />
-    </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="QRC"
-          SourceType="Item" />
-      </StringListProperty.DataSource>
-    </StringListProperty>
-    <StringProperty
-      Name="QtCommandLine"
-      Subcategory="General"
-      HelpContext="0"
-      HelpUrl="http://code.google.com/p/xr-core/wiki/QtRules"
-      DisplayName="C++ Command Line Options"
-      Description="Copy the command line options from your C/C++ section to match the qt compilation with your setup. Make sure you remove the /Fo option, for more details refer to the documentation."
-      Switch="[value]" />
-    <StringProperty
-      Name="QtQrcPfx"
-      Subcategory="Output"
-      HelpContext="0"
-      HelpUrl="http://code.google.com/p/xr-qt-msvc/"
-      DisplayName="Output file postfix"
-      Description="A postfix is added to the source and object files generated to prevent conflict with your source files. [Example: _qrc leads to a.qrc -&gt; a_qrc.cpp]"
-      Switch="[value]" />
-    <StringProperty
-      Name="CommandLineTemplate"
-      DisplayName="Command Line"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <DynamicEnumProperty
-      Name="QRCBeforeTargets"
-      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="^QRCBeforeTargets|^Compute" />
-      </DynamicEnumProperty.ProviderSettings>
-      <DynamicEnumProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          HasConfigurationCondition="true" />
-      </DynamicEnumProperty.DataSource>
-    </DynamicEnumProperty>
-    <DynamicEnumProperty
-      Name="QRCAfterTargets"
-      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="^QRCAfterTargets|^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="QRC"
-    DisplayName="Qt Resource Compiler" />
-  <FileExtension
-    Name="*.qrc"
-    ContentType="QRC" />
-  <ContentType
-    Name="QRC"
-    DisplayName="Qt Resource Compiler"
-    ItemType="QRC" />
-</ProjectSchemaDefinitions>
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
deleted file mode 100644
index 341d3a81..00000000
--- a/src/common/common.vcxproj
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DFE335FC-755D-4BAA-8452-94434F8A1EDB}</ProjectGuid>
-    <RootNamespace>common</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\optimization_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\optimization_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\optimization_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\optimization_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib />
-    <ClCompile>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="atomic.h" />
-    <ClInclude Include="atomic_gcc.h" />
-    <ClInclude Include="atomic_win32.h" />
-    <ClInclude Include="bit_field.h" />
-    <ClInclude Include="break_points.h" />
-    <ClInclude Include="chunk_file.h" />
-    <ClInclude Include="common.h" />
-    <ClInclude Include="common_funcs.h" />
-    <ClInclude Include="common_paths.h" />
-    <ClInclude Include="common_types.h" />
-    <ClInclude Include="console_listener.h" />
-    <ClInclude Include="cpu_detect.h" />
-    <ClInclude Include="debug_interface.h" />
-    <ClInclude Include="emu_window.h" />
-    <ClInclude Include="extended_trace.h" />
-    <ClInclude Include="fifo_queue.h" />
-    <ClInclude Include="file_search.h" />
-    <ClInclude Include="file_util.h" />
-    <ClInclude Include="fixed_size_queue.h" />
-    <ClInclude Include="hash.h" />
-    <ClInclude Include="linear_disk_cache.h" />
-    <ClInclude Include="log.h" />
-    <ClInclude Include="log_manager.h" />
-    <ClInclude Include="math_util.h" />
-    <ClInclude Include="memory_util.h" />
-    <ClInclude Include="mem_arena.h" />
-    <ClInclude Include="msg_handler.h" />
-    <ClInclude Include="platform.h" />
-    <ClInclude Include="scm_rev.h" />
-    <ClInclude Include="std_condition_variable.h" />
-    <ClInclude Include="std_mutex.h" />
-    <ClInclude Include="std_thread.h" />
-    <ClInclude Include="string_util.h" />
-    <ClInclude Include="swap.h" />
-    <ClInclude Include="symbols.h" />
-    <ClInclude Include="thread.h" />
-    <ClInclude Include="thread_queue_list.h" />
-    <ClInclude Include="thunk.h" />
-    <ClInclude Include="timer.h" />
-    <ClInclude Include="utf8.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="break_points.cpp" />
-    <ClCompile Include="console_listener.cpp" />
-    <ClCompile Include="extended_trace.cpp" />
-    <ClCompile Include="file_search.cpp" />
-    <ClCompile Include="file_util.cpp" />
-    <ClCompile Include="hash.cpp" />
-    <ClCompile Include="log_manager.cpp" />
-    <ClCompile Include="math_util.cpp" />
-    <ClCompile Include="memory_util.cpp" />
-    <ClCompile Include="mem_arena.cpp" />
-    <ClCompile Include="misc.cpp" />
-    <ClCompile Include="msg_handler.cpp" />
-    <ClCompile Include="scm_rev.cpp" />
-    <ClCompile Include="string_util.cpp" />
-    <ClCompile Include="symbols.cpp" />
-    <ClCompile Include="thread.cpp" />
-    <ClCompile Include="timer.cpp" />
-    <ClCompile Include="utf8.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters
deleted file mode 100644
index 59268ce5..00000000
--- a/src/common/common.vcxproj.filters
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="atomic.h" />
-    <ClInclude Include="atomic_gcc.h" />
-    <ClInclude Include="atomic_win32.h" />
-    <ClInclude Include="bit_field.h" />
-    <ClInclude Include="break_points.h" />
-    <ClInclude Include="chunk_file.h" />
-    <ClInclude Include="common.h" />
-    <ClInclude Include="common_funcs.h" />
-    <ClInclude Include="common_paths.h" />
-    <ClInclude Include="common_types.h" />
-    <ClInclude Include="console_listener.h" />
-    <ClInclude Include="cpu_detect.h" />
-    <ClInclude Include="debug_interface.h" />
-    <ClInclude Include="emu_window.h" />
-    <ClInclude Include="extended_trace.h" />
-    <ClInclude Include="fifo_queue.h" />
-    <ClInclude Include="file_search.h" />
-    <ClInclude Include="file_util.h" />
-    <ClInclude Include="fixed_size_queue.h" />
-    <ClInclude Include="hash.h" />
-    <ClInclude Include="linear_disk_cache.h" />
-    <ClInclude Include="log.h" />
-    <ClInclude Include="log_manager.h" />
-    <ClInclude Include="math_util.h" />
-    <ClInclude Include="mem_arena.h" />
-    <ClInclude Include="memory_util.h" />
-    <ClInclude Include="msg_handler.h" />
-    <ClInclude Include="platform.h" />
-    <ClInclude Include="std_condition_variable.h" />
-    <ClInclude Include="std_mutex.h" />
-    <ClInclude Include="std_thread.h" />
-    <ClInclude Include="string_util.h" />
-    <ClInclude Include="swap.h" />
-    <ClInclude Include="thread.h" />
-    <ClInclude Include="thunk.h" />
-    <ClInclude Include="timer.h" />
-    <ClInclude Include="utf8.h" />
-    <ClInclude Include="symbols.h" />
-    <ClInclude Include="scm_rev.h" />
-    <ClInclude Include="thread_queue_list.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="break_points.cpp" />
-    <ClCompile Include="console_listener.cpp" />
-    <ClCompile Include="extended_trace.cpp" />
-    <ClCompile Include="file_search.cpp" />
-    <ClCompile Include="file_util.cpp" />
-    <ClCompile Include="hash.cpp" />
-    <ClCompile Include="log_manager.cpp" />
-    <ClCompile Include="math_util.cpp" />
-    <ClCompile Include="mem_arena.cpp" />
-    <ClCompile Include="memory_util.cpp" />
-    <ClCompile Include="misc.cpp" />
-    <ClCompile Include="msg_handler.cpp" />
-    <ClCompile Include="string_util.cpp" />
-    <ClCompile Include="thread.cpp" />
-    <ClCompile Include="timer.cpp" />
-    <ClCompile Include="utf8.cpp" />
-    <ClCompile Include="symbols.cpp" />
-    <ClCompile Include="scm_rev.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-</Project>
diff --git a/src/common/scm_rev_gen.js b/src/common/scm_rev_gen.js
deleted file mode 100644
index 98313e37..00000000
--- a/src/common/scm_rev_gen.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var wshShell        = new ActiveXObject("WScript.Shell")
-var oFS             = new ActiveXObject("Scripting.FileSystemObject");
-
-var outfile         = "scm_rev.cpp";
-var cmd_revision    = " rev-parse HEAD";
-var cmd_describe    = " describe --always --long --dirty";
-var cmd_branch      = " rev-parse --abbrev-ref HEAD";
-
-var git_search_paths = {
-    "git.cmd": 1,
-    "git": 1,
-    "C:\\Program Files (x86)\\Git\\bin\\git.exe": 1,
-    "C:\\Program Files\\Git\\bin\\git.exe": 1
-};
-
-function GetGitExe() {
-    for (var gitexe in git_search_paths) {
-        try {
-            wshShell.Exec(gitexe);
-            return gitexe;
-        } catch (e) {
-        }
-    }
-
-    WScript.Echo("Cannot find git or git.cmd, check your PATH:\n" +
-        wshShell.ExpandEnvironmentStrings("%PATH%"));
-    WScript.Quit(1);
-}
-
-function GetFirstStdOutLine(cmd) {
-    try {
-        return wshShell.Exec(cmd).StdOut.ReadLine();
-    } catch (e) {
-        // catch "the system cannot find the file specified" error
-        WScript.Echo("Failed to exec " + cmd + " this should never happen");
-        WScript.Quit(1);
-    }
-}
-
-function GetFileContents(f) {
-    try {
-        return oFS.OpenTextFile(f).ReadAll();
-    } catch (e) {
-        // file doesn't exist
-        return "";
-    }
-}
-
-// get info from git
-var gitexe      = GetGitExe();
-var revision    = GetFirstStdOutLine(gitexe + cmd_revision);
-var describe    = GetFirstStdOutLine(gitexe + cmd_describe);
-var branch      = GetFirstStdOutLine(gitexe + cmd_branch);
-var isMaster    = +("master" == branch);
-
-// remove hash (and trailing "-0" if needed) from description
-describe = describe.replace(/(-0)?-[^-]+(-dirty)?$/, '$2');
-
-var out_contents =
-    "#include \"common/scm_rev.h\"\n" +
-    "namespace Common {\n" +
-    "    const char g_scm_rev[]      = \"" + revision + "\";\n" +
-    "    const char g_scm_branch[]   = \"" + branch + "\";\n" +
-    "    const char g_scm_desc[]     = \"" + describe + "\";\n" +
-    "}\n";
-
-// check if file needs updating
-if (out_contents == GetFileContents(outfile)) {
-    WScript.Echo(outfile + " current at " + describe);
-} else {
-    // needs updating - writeout current info
-    oFS.CreateTextFile(outfile, true).Write(out_contents);
-    WScript.Echo(outfile + " updated to " + describe);
-}
diff --git a/src/common/scm_rev_gen.vcxproj b/src/common/scm_rev_gen.vcxproj
deleted file mode 100644
index f4f2a623..00000000
--- a/src/common/scm_rev_gen.vcxproj
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="force_rebuild.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="scm_rev_gen.js" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid>
-    <RootNamespace>scm_rev_gen</RootNamespace>
-    <ProjectName>scm_rev_gen</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="..\..\vsprops\base.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="..\..\vsprops\base.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="..\..\vsprops\base.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>cscript /nologo /E:JScript "scm_rev_gen.js"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>cscript /nologo /E:JScript "scm_rev_gen.js"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>cscript /nologo /E:JScript "scm_rev_gen.js"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
deleted file mode 100644
index ddc174c2..00000000
--- a/src/core/core.vcxproj
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8AEA7F29-3466-4786-A10D-6A4BD0610977}</ProjectGuid>
-    <RootNamespace>core</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\optimization_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\optimization_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\optimization_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\optimization_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <CustomBuildBeforeTargets>
-    </CustomBuildBeforeTargets>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <CustomBuildBeforeTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <CustomBuildBeforeTargets>
-    </CustomBuildBeforeTargets>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <CustomBuildBeforeTargets />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <ClCompile />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <ClCompile />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <ClCompile />
-    <ClCompile />
-    <ClCompile>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <ClCompile />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\common\common.vcxproj">
-      <Project>{dfe335fc-755d-4baa-8452-94434f8a1edb}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="arm\disassembler\arm_disasm.cpp" />
-    <ClCompile Include="arm\disassembler\load_symbol_map.cpp" />
-    <ClCompile Include="arm\interpreter\armcopro.cpp" />
-    <ClCompile Include="arm\interpreter\armemu.cpp" />
-    <ClCompile Include="arm\interpreter\arminit.cpp" />
-    <ClCompile Include="arm\interpreter\armmmu.cpp" />
-    <ClCompile Include="arm\interpreter\armos.cpp" />
-    <ClCompile Include="arm\interpreter\armsupp.cpp" />
-    <ClCompile Include="arm\interpreter\armvirt.cpp" />
-    <ClCompile Include="arm\interpreter\arm_interpreter.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\arm1176jzf_s_mmu.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\cache.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\maverick.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\rb.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\sa_mmu.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\tlb.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\wb.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\xscale_copro.cpp" />
-    <ClCompile Include="arm\interpreter\thumbemu.cpp" />
-    <ClCompile Include="arm\interpreter\vfp\vfp.cpp" />
-    <ClCompile Include="arm\interpreter\vfp\vfpdouble.cpp" />
-    <ClCompile Include="arm\interpreter\vfp\vfpinstr.cpp" />
-    <ClCompile Include="arm\interpreter\vfp\vfpsingle.cpp" />
-    <ClCompile Include="core.cpp" />
-    <ClCompile Include="core_timing.cpp" />
-    <ClCompile Include="file_sys\archive_romfs.cpp" />
-    <ClCompile Include="hle\config_mem.cpp" />
-    <ClCompile Include="hle\coprocessor.cpp" />
-    <ClCompile Include="hle\hle.cpp" />
-    <ClCompile Include="hle\kernel\address_arbiter.cpp" />
-    <ClCompile Include="hle\kernel\archive.cpp" />
-    <ClCompile Include="hle\kernel\event.cpp" />
-    <ClCompile Include="hle\kernel\kernel.cpp" />
-    <ClCompile Include="hle\kernel\mutex.cpp" />
-    <ClCompile Include="hle\kernel\shared_memory.cpp" />
-    <ClCompile Include="hle\kernel\thread.cpp" />
-    <ClCompile Include="hle\service\apt.cpp" />
-    <ClCompile Include="hle\service\fs.cpp" />
-    <ClCompile Include="hle\service\gsp.cpp" />
-    <ClCompile Include="hle\service\hid.cpp" />
-    <ClCompile Include="hle\service\ndm.cpp" />
-    <ClCompile Include="hle\service\service.cpp" />
-    <ClCompile Include="hle\service\srv.cpp" />
-    <ClCompile Include="hle\svc.cpp" />
-    <ClCompile Include="hw\gpu.cpp" />
-    <ClCompile Include="hw\hw.cpp" />
-    <ClCompile Include="hw\ndma.cpp" />
-    <ClCompile Include="loader\elf.cpp" />
-    <ClCompile Include="loader\loader.cpp" />
-    <ClCompile Include="loader\ncch.cpp" />
-    <ClCompile Include="mem_map.cpp" />
-    <ClCompile Include="mem_map_funcs.cpp" />
-    <ClCompile Include="system.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="arm\arm_interface.h" />
-    <ClInclude Include="arm\disassembler\arm_disasm.h" />
-    <ClInclude Include="arm\disassembler\load_symbol_map.h" />
-    <ClInclude Include="arm\interpreter\armcpu.h" />
-    <ClInclude Include="arm\interpreter\armdefs.h" />
-    <ClInclude Include="arm\interpreter\armemu.h" />
-    <ClInclude Include="arm\interpreter\armmmu.h" />
-    <ClInclude Include="arm\interpreter\armos.h" />
-    <ClInclude Include="arm\interpreter\arm_interpreter.h" />
-    <ClInclude Include="arm\interpreter\arm_regformat.h" />
-    <ClInclude Include="arm\interpreter\mmu\arm1176jzf_s_mmu.h" />
-    <ClInclude Include="arm\interpreter\mmu\cache.h" />
-    <ClInclude Include="arm\interpreter\mmu\rb.h" />
-    <ClInclude Include="arm\interpreter\mmu\sa_mmu.h" />
-    <ClInclude Include="arm\interpreter\mmu\tlb.h" />
-    <ClInclude Include="arm\interpreter\mmu\wb.h" />
-    <ClInclude Include="arm\interpreter\skyeye_defs.h" />
-    <ClInclude Include="arm\interpreter\vfp\asm_vfp.h" />
-    <ClInclude Include="arm\interpreter\vfp\vfp.h" />
-    <ClInclude Include="arm\interpreter\vfp\vfp_helper.h" />
-    <ClInclude Include="core.h" />
-    <ClInclude Include="core_timing.h" />
-    <ClInclude Include="file_sys\archive.h" />
-    <ClInclude Include="file_sys\archive_romfs.h" />
-    <ClInclude Include="hle\config_mem.h" />
-    <ClInclude Include="hle\coprocessor.h" />
-    <ClInclude Include="hle\function_wrappers.h" />
-    <ClInclude Include="hle\hle.h" />
-    <ClInclude Include="hle\kernel\address_arbiter.h" />
-    <ClInclude Include="hle\kernel\archive.h" />
-    <ClInclude Include="hle\kernel\event.h" />
-    <ClInclude Include="hle\kernel\kernel.h" />
-    <ClInclude Include="hle\kernel\mutex.h" />
-    <ClInclude Include="hle\kernel\shared_memory.h" />
-    <ClInclude Include="hle\kernel\thread.h" />
-    <ClInclude Include="hle\service\apt.h" />
-    <ClInclude Include="hle\service\fs.h" />
-    <ClInclude Include="hle\service\gsp.h" />
-    <ClInclude Include="hle\service\hid.h" />
-    <ClInclude Include="hle\service\ndm.h" />
-    <ClInclude Include="hle\service\service.h" />
-    <ClInclude Include="hle\service\srv.h" />
-    <ClInclude Include="hle\svc.h" />
-    <ClInclude Include="hw\gpu.h" />
-    <ClInclude Include="hw\hw.h" />
-    <ClInclude Include="hw\ndma.h" />
-    <ClInclude Include="loader\elf.h" />
-    <ClInclude Include="loader\loader.h" />
-    <ClInclude Include="loader\ncch.h" />
-    <ClInclude Include="mem_map.h" />
-    <ClInclude Include="system.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
deleted file mode 100644
index 68ba9e50..00000000
--- a/src/core/core.vcxproj.filters
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="arm">
-      <UniqueIdentifier>{b84ab55c-588b-45f0-a5ba-f9ebb0442f13}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\disassembler">
-      <UniqueIdentifier>{61100188-a726-4024-ab16-95ee242b446e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="file_sys">
-      <UniqueIdentifier>{7f618562-73d1-4f55-9628-887497c27654}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\interpreter">
-      <UniqueIdentifier>{cca8b763-8a80-4478-9bcc-3c979293c357}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hw">
-      <UniqueIdentifier>{d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hle">
-      <UniqueIdentifier>{8b62769e-3e2a-4a57-a7bc-b3b2933c2bc7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hle\service">
-      <UniqueIdentifier>{812c5189-ca49-4704-b842-3ffad09092d3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\interpreter\vfp">
-      <UniqueIdentifier>{de62238f-a28e-4a33-8495-23fed6784588}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\interpreter\mmu">
-      <UniqueIdentifier>{13ef9860-2ba0-47e9-a93d-b4052adab269}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hle\kernel">
-      <UniqueIdentifier>{8089d94b-5faa-43dc-854b-ffd2fa2e7fe3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="loader">
-      <UniqueIdentifier>{491d5558-5f3a-4283-8ba4-0a58b1984e37}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="arm\disassembler\arm_disasm.cpp">
-      <Filter>arm\disassembler</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\arm_interpreter.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armemu.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\arminit.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armmmu.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armos.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armsupp.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armvirt.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\thumbemu.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="hw\hw.cpp">
-      <Filter>hw</Filter>
-    </ClCompile>
-    <ClCompile Include="core.cpp" />
-    <ClCompile Include="mem_map.cpp" />
-    <ClCompile Include="mem_map_funcs.cpp" />
-    <ClCompile Include="system.cpp" />
-    <ClCompile Include="core_timing.cpp" />
-    <ClCompile Include="hle\hle.cpp">
-      <Filter>hle</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\service.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\apt.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\srv.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\gsp.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\hid.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="hw\ndma.cpp">
-      <Filter>hw</Filter>
-    </ClCompile>
-    <ClCompile Include="hw\gpu.cpp">
-      <Filter>hw</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\disassembler\load_symbol_map.cpp">
-      <Filter>arm\disassembler</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\coprocessor.cpp">
-      <Filter>hle</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\config_mem.cpp">
-      <Filter>hle</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\vfp\vfp.cpp">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\vfp\vfpinstr.cpp">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\vfp\vfpdouble.cpp">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\vfp\vfpsingle.cpp">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\arm1176jzf_s_mmu.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\xscale_copro.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\sa_mmu.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\cache.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\rb.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\tlb.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\wb.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\maverick.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\kernel.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\thread.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\svc.cpp">
-      <Filter>hle</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\mutex.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armcopro.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\event.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\ndm.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="loader\loader.cpp">
-      <Filter>loader</Filter>
-    </ClCompile>
-    <ClCompile Include="loader\ncch.cpp">
-      <Filter>loader</Filter>
-    </ClCompile>
-    <ClCompile Include="loader\elf.cpp">
-      <Filter>loader</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\archive.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\fs.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="file_sys\archive_romfs.cpp">
-      <Filter>file_sys</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\shared_memory.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\address_arbiter.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="arm\disassembler\arm_disasm.h">
-      <Filter>arm\disassembler</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\arm_interpreter.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\arm_regformat.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\armcpu.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\armdefs.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\armemu.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\armmmu.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\armos.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\skyeye_defs.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="hw\hw.h">
-      <Filter>hw</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\arm_interface.h">
-      <Filter>arm</Filter>
-    </ClInclude>
-    <ClInclude Include="core.h" />
-    <ClInclude Include="core_timing.h" />
-    <ClInclude Include="mem_map.h" />
-    <ClInclude Include="system.h" />
-    <ClInclude Include="hle\hle.h">
-      <Filter>hle</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\function_wrappers.h">
-      <Filter>hle</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\service.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\apt.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\srv.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\gsp.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\hid.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="hw\ndma.h">
-      <Filter>hw</Filter>
-    </ClInclude>
-    <ClInclude Include="hw\gpu.h">
-      <Filter>hw</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\disassembler\load_symbol_map.h">
-      <Filter>arm\disassembler</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\coprocessor.h">
-      <Filter>hle</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\config_mem.h">
-      <Filter>hle</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\vfp\asm_vfp.h">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\vfp\vfp.h">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\vfp\vfp_helper.h">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\arm1176jzf_s_mmu.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\cache.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\rb.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\tlb.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\wb.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\sa_mmu.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\kernel.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\thread.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\svc.h">
-      <Filter>hle</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\mutex.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\event.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\ndm.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="loader\loader.h">
-      <Filter>loader</Filter>
-    </ClInclude>
-    <ClInclude Include="loader\ncch.h">
-      <Filter>loader</Filter>
-    </ClInclude>
-    <ClInclude Include="loader\elf.h">
-      <Filter>loader</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\archive.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\fs.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="file_sys\archive.h">
-      <Filter>file_sys</Filter>
-    </ClInclude>
-    <ClInclude Include="file_sys\archive_romfs.h">
-      <Filter>file_sys</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\shared_memory.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\address_arbiter.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/video_core/video_core.vcxproj b/src/video_core/video_core.vcxproj
deleted file mode 100644
index a115f44b..00000000
--- a/src/video_core/video_core.vcxproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="debug_utils\debug_utils.cpp" />
-    <ClCompile Include="renderer_opengl\generated\gl_3_2_core.c" />
-    <ClCompile Include="renderer_opengl\renderer_opengl.cpp" />
-    <ClCompile Include="renderer_opengl\gl_shader_util.cpp" />
-    <ClCompile Include="clipper.cpp" />
-    <ClCompile Include="command_processor.cpp" />
-    <ClCompile Include="primitive_assembly.cpp" />
-    <ClCompile Include="rasterizer.cpp" />
-    <ClCompile Include="utils.cpp" />
-    <ClCompile Include="vertex_shader.cpp" />
-    <ClCompile Include="video_core.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="clipper.h" />
-    <ClInclude Include="command_processor.h" />
-    <ClInclude Include="gpu_debugger.h" />
-    <ClInclude Include="math.h" />
-    <ClInclude Include="pica.h" />
-    <ClInclude Include="primitive_assembly.h" />
-    <ClInclude Include="rasterizer.h" />
-    <ClInclude Include="renderer_base.h" />
-    <ClInclude Include="renderer_opengl\generated\gl_3_2_core.h" />
-    <ClInclude Include="utils.h" />
-    <ClInclude Include="vertex_shader.h" />
-    <ClInclude Include="video_core.h" />
-    <ClInclude Include="debug_utils\debug_utils.h" />
-    <ClInclude Include="renderer_opengl\renderer_opengl.h" />
-    <ClInclude Include="renderer_opengl\gl_shader_util.h" />
-    <ClInclude Include="renderer_opengl\gl_shaders.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6678D1A3-33A6-48A9-878B-48E5D2903D27}</ProjectGuid>
-    <RootNamespace>input_common</RootNamespace>
-    <ProjectName>video_core</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\Base.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\optimization_debug.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\Base.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\optimization_debug.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\Base.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\optimization_release.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\Base.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\optimization_release.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <ClCompile />
-    <ClCompile />
-    <ClCompile />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/src/video_core/video_core.vcxproj.filters b/src/video_core/video_core.vcxproj.filters
deleted file mode 100644
index b40271ab..00000000
--- a/src/video_core/video_core.vcxproj.filters
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="renderer_opengl">
-      <UniqueIdentifier>{e0245557-dbd4-423e-9399-513d5e99f1e4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="debug_utils">
-      <UniqueIdentifier>{0ac498e6-bbd8-46e3-9d5f-e816546ab90e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="renderer_opengl\generated">
-      <UniqueIdentifier>{00301d57-24b3-4717-86a4-0073d131eb78}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="renderer_opengl\renderer_opengl.cpp">
-      <Filter>renderer_opengl</Filter>
-    </ClCompile>
-    <ClCompile Include="renderer_opengl\gl_shader_util.cpp">
-      <Filter>renderer_opengl</Filter>
-    </ClCompile>
-    <ClCompile Include="clipper.cpp" />
-    <ClCompile Include="command_processor.cpp" />
-    <ClCompile Include="primitive_assembly.cpp" />
-    <ClCompile Include="rasterizer.cpp" />
-    <ClCompile Include="utils.cpp" />
-    <ClCompile Include="vertex_shader.cpp" />
-    <ClCompile Include="video_core.cpp" />
-    <ClCompile Include="debug_utils\debug_utils.cpp">
-      <Filter>debug_utils</Filter>
-    </ClCompile>
-    <ClCompile Include="renderer_opengl\generated\gl_3_2_core.c">
-      <Filter>renderer_opengl\generated</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="clipper.h" />
-    <ClInclude Include="command_processor.h" />
-    <ClInclude Include="gpu_debugger.h" />
-    <ClInclude Include="math.h" />
-    <ClInclude Include="pica.h" />
-    <ClInclude Include="primitive_assembly.h" />
-    <ClInclude Include="rasterizer.h" />
-    <ClInclude Include="renderer_base.h" />
-    <ClInclude Include="utils.h" />
-    <ClInclude Include="vertex_shader.h" />
-    <ClInclude Include="video_core.h" />
-    <ClInclude Include="renderer_opengl\renderer_opengl.h">
-      <Filter>renderer_opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer_opengl\gl_shader_util.h">
-      <Filter>renderer_opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer_opengl\gl_shaders.h">
-      <Filter>renderer_opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="debug_utils\debug_utils.h">
-      <Filter>debug_utils</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer_opengl\generated\gl_3_2_core.h">
-      <Filter>renderer_opengl\generated</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/vsprops/app.props b/vsprops/app.props
deleted file mode 100644
index b9c583e0..00000000
--- a/vsprops/app.props
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <EmuBinDir>$(SolutionDir)bin\$(PlatformName)\</EmuBinDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OutDir>$(EmuBinDir)</OutDir>
-    <TargetName>$(ProjectName)$(Configuration)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)data" "$(EmuBinDir)" /Y /S /D
-xcopy "$(ExternalsDir)glfw-3.0.4.bin\lib-msvc_$(PlatformToolset)-$(Platform)\glfw3.dll" "$(EmuBinDir)" /Y /S /D
-%(Command)</Command>
-    </PostBuildEvent>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="EmuBinDir">
-      <Value>$(EmuBinDir)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/vsprops/base.props b/vsprops/base.props
deleted file mode 100644
index 7eedacc7..00000000
--- a/vsprops/base.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <IntDir>$(SolutionDir)build\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
-    <OutDir>$(SolutionDir)build\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <StructMemberAlignment>16Bytes</StructMemberAlignment>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>
-      </PreprocessorDefinitions>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/vsprops/code_generation_debug.props b/vsprops/code_generation_debug.props
deleted file mode 100644
index abd617d7..00000000
--- a/vsprops/code_generation_debug.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;_SECURE_SCL=1;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <MOC />
-    <MOC />
-    <Link>
-      <AdditionalOptions>/NODEFAULTLIB:LIBCMT %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/vsprops/code_generation_release.props b/vsprops/code_generation_release.props
deleted file mode 100644
index 732092ad..00000000
--- a/vsprops/code_generation_release.props
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_PropertySheetDisplayName>code_generation_release</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <Link>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/vsprops/externals.props b/vsprops/externals.props
deleted file mode 100644
index 2d320c79..00000000
--- a/vsprops/externals.props
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <ExternalsDir>$(SolutionDir)externals\</ExternalsDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>externals</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)glfw-3.0.4.bin\include;$(ExternalsDir)qhexedit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>
-      </PreprocessorDefinitions>
-    </ClCompile>
-    <Lib />
-    <Link>
-      <AdditionalLibraryDirectories>$(ExternalsDir)glfw-3.0.4.bin\lib-msvc_$(PlatformToolset)-$(Platform);$(ExternalsDir)libjpeg;$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>glfw3dll.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-    </Link>
-    <ProjectReference />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="ExternalsDir">
-      <Value>$(ExternalsDir)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/vsprops/optimization_debug.props b/vsprops/optimization_debug.props
deleted file mode 100644
index 3c7081f1..00000000
--- a/vsprops/optimization_debug.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <OmitFramePointers>false</OmitFramePointers>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/vsprops/optimization_release.props b/vsprops/optimization_release.props
deleted file mode 100644
index ea1573e6..00000000
--- a/vsprops/optimization_release.props
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <OmitFramePointers>true</OmitFramePointers>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <Optimization>MaxSpeed</Optimization>
-    </ClCompile>
-    <Link>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/vsprops/qt.props b/vsprops/qt.props
deleted file mode 100644
index ba9455e9..00000000
--- a/vsprops/qt.props
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <QtIncludeDir>$(QTDIR)\include\</QtIncludeDir>
-    <QtLibraryDir>$(QTDIR)\lib\</QtLibraryDir>
-    <QtBinaryDir>$(QTDIR)\bin\</QtBinaryDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <IncludePath>$(QtIncludeDir);$(QtIncludeDir)QtGui;$(QtIncludeDir)QtCore;$(QtIncludeDir)Qt;$(QtIncludeDir)QtOpenGL;$(QtIncludeDir)QtANGLE;$(QtIncludeDir)QtWidgets;$(ProjectDir);$(IncludePath)</IncludePath>
-    <LibraryPath>$(QtLibraryDir);$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <UIC />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <UIC>
-      <QtUicPrefix>ui_</QtUicPrefix>
-      <QtUicExt>.h</QtUicExt>
-    </UIC>
-    <MOC>
-      <QtCommandLine>/I"$(SolutionDir)src" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit"</QtCommandLine>
-      <QtKeywords>false</QtKeywords>
-    </MOC>
-    <Link />
-    <ClCompile />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="QtIncludeDir">
-      <Value>$(QtIncludeDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="QtLibraryDir">
-      <Value>$(QtLibraryDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="QtBinaryDir">
-      <Value>$(QtBinaryDir)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/vsprops/qt_libs_debug.props b/vsprops/qt_libs_debug.props
deleted file mode 100644
index 65261c90..00000000
--- a/vsprops/qt_libs_debug.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtOpenGLd4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <MOC>
-      <QtNoDebug>false</QtNoDebug>
-      <QtCommandLine>/I"$(SolutionDir)src" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" /D"_DEBUG"</QtCommandLine>
-    </MOC>
-    <PostBuildEvent>
-      <Command>xcopy "$(QtBinaryDir)QtCored4.dll" "$(EmuBinDir)" /Y /S /D
-xcopy "$(QtBinaryDir)QtGuid4.dll" "$(EmuBinDir)" /Y /S /D
-xcopy "$(QtBinaryDir)QtOpenGLd4.dll" "$(EmuBinDir)" /Y /S /D</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/vsprops/qt_libs_release.props b/vsprops/qt_libs_release.props
deleted file mode 100644
index 0f02f30d..00000000
--- a/vsprops/qt_libs_release.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(QtBinaryDir)QtCore4.dll" "$(EmuBinDir)" /Y /S /D
-xcopy "$(QtBinaryDir)QtGui4.dll" "$(EmuBinDir)" /Y /S /D
-xcopy "$(QtBinaryDir)QtOpenGL4.dll" "$(EmuBinDir)" /Y /S /D</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file