Merge pull request #69 from yuriks/cmake-cleanup

CMake cleanup
2024-11-15 05:08:23 +00:00 · 2014-09-01 22:29:23 -04:00 · 2014-09-01 22:29:23 -04:00 · c0e48432cd
commit c0e48432cd
parent 76372feb19 c57de3e404
96 changed files with 3173 additions and 24495 deletions
--- 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
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@ -6,13 +6,19 @@ set -e
 if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then
    sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
    sudo apt-get -qq update
-    sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev libglew-dev libxcursor-dev
+    sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev libxcursor-dev
    sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
-    git clone https://github.com/glfw/glfw.git
-    mkdir glfw/build && cd glfw/build
-    cmake .. && make && sudo make install 
-    cd -	
+    (
+        git clone https://github.com/glfw/glfw.git --branch 3.0.4 --depth 1
+        mkdir glfw/build && cd glfw/build
+        cmake .. && make -j2 && sudo make install
+    )
+
+    sudo apt-get install lib32stdc++6
+    sudo mkdir -p /usr/local
+    curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \
+        | sudo tar -xz -C /usr/local --strip-components=1
 elif [ "$TRAVIS_OS_NAME" = osx ]; then
    brew tap homebrew/versions
-    brew install glew qt5 glfw3 pkgconfig
+    brew install qt5 glfw3 pkgconfig
 fi
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,80 +1,131 @@
-cmake_minimum_required(VERSION 2.8.7)
+# CMake 2.8.11 required for Qt5 settings to be applied automatically on
+# dependent libraries.
+cmake_minimum_required(VERSION 2.8.11)

 project(citra)

-SET(CXX_COMPILE_FLAGS "-std=c++11")
-
-# silence some spam
-add_definitions(-Wno-attributes)
+if (NOT MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-attributes")
+else()
+    # Silence deprecation warnings
+    add_definitions(/D_CRT_SECURE_NO_WARNINGS)
+endif()
 add_definitions(-DSINGLETHREADED)
-add_definitions(${CXX_COMPILE_FLAGS})

 find_package(PNG)
 if (PNG_FOUND)
    add_definitions(-DHAVE_PNG)
 endif ()

-# dependency checking
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules/")
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
-include(FindX11 REQUIRED)
-find_package(PkgConfig REQUIRED)
-find_package(GLEW REQUIRED)
-find_package(OpenGL REQUIRED)
-pkg_search_module(GLFW REQUIRED glfw3)
+# Include bundled CMake modules
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules")
+
+find_package(OpenGL REQUIRED)
+include_directories(${OPENGL_INCLUDE_DIR})
+
+option(ENABLE_GLFW "Enable the GLFW frontend" ON)
+if (ENABLE_GLFW)
+    if (WIN32)
+        # Detect toolchain and platform
+        if (MSVC)
+            if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+                set(TMP_ARCH "x64")
+            else()
+                set(TMP_ARCH "Win32")
+            endif()
+
+            if (MSVC11) # Visual C++ 2012
+                set(TMP_TOOLSET "v110")
+            elseif (MSVC12) # Visual C++ 2013
+                set(TMP_TOOLSET "v120")
+            else()
+                set(TMP_TOOLSET "UNSUPPORTED")
+                message(SEND_ERROR "We don't supply GLFW binaries for your version of MSVC, you might have to provide them yourself.")
+            endif()
+
+            set(TMP_TOOLSET "msvc_${TMP_TOOLSET}-${TMP_ARCH}")
+        else()
+            # Assume mingw
+            if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+                set(TMP_ARCH "x86_64")
+            else()
+                set(TMP_ARCH "i686")
+            endif()
+
+            set(TMP_TOOLSET "mingw-${TMP_ARCH}")
+        endif()
+
+        set(GLFW_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/glfw-3.0.4.bin")
+        set(GLFW_INCLUDE_DIRS "${GLFW_PREFIX}/include" CACHE PATH "Path to GLFW3 headers")
+        set(GLFW_LIBRARY_DIRS "${GLFW_PREFIX}/lib-${TMP_TOOLSET}" CACHE PATH "Path to GLFW3 libraries")
+
+        # Clean up after ourselves
+        unset(TMP_TOOLSET)
+        unset(TMP_ARCH)
+
+        set(GLFW_LIBRARIES glfw3)
+    else()
+        find_package(X11 REQUIRED)
+        find_package(PkgConfig REQUIRED)
+        pkg_search_module(GLFW REQUIRED glfw3)
+    endif()
+
+    include_directories(${GLFW_INCLUDE_DIRS})
+    link_directories(${GLFW_LIBRARY_DIRS})
+endif()

-# corefoundation is required only on OSX
 IF (APPLE)
+    # CoreFoundation is required only on OSX
    FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
 ENDIF (APPLE)

-#external includes
-include_directories(${GLFW_INCLUDE_DIRS})
-include_directories(${OPENGL_INCLUDE_DIR})
-include_directories(${GLEW_INCLUDE_PATH})
-
-# workaround for GLFW linking on OSX
-link_directories(${GLFW_LIBRARY_DIRS})
-
-option(DISABLE_QT "Disable Qt GUI" OFF)
-option(USE_QT5 "Use Qt5 when available" ON)
-if (NOT DISABLE_QT)
-    if(USE_QT5)
-        find_package(Qt5Gui)
-        find_package(Qt5Widgets)
-        find_package(Qt5OpenGL)
-        if(NOT Qt5Gui_FOUND OR NOT Qt5Widgets_FOUND OR NOT Qt5OpenGL_FOUND)
-            message("Qt5 libraries not found! Using Qt4 instead.")
-            set(USE_QT5 OFF)
-        endif()
+option(ENABLE_QT "Enable the Qt frontend" ON)
+option(CITRA_FORCE_QT4 "Use Qt4 even if Qt5 is available." OFF)
+if (ENABLE_QT)
+    # Set CMAKE_PREFIX_PATH if QTDIR is defined in the environment This allows CMake to
+    # automatically find the Qt packages on Windows
+    if (DEFINED ENV{QTDIR})
+        list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR}")
    endif()
-    if(NOT USE_QT5)
-        include(FindQt4)
-        find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL)

-        if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND)
-            include(${QT_USE_FILE})
-            include_directories(${QT_INCLUDES})
-        else()
-            message("Qt4 libraries not found! Disabling Qt GUI")
-            set(DISABLE_QT ON)
-        endif()
+    if (NOT CITRA_FORCE_QT4)
+        find_package(Qt5 COMPONENTS Widgets OpenGL)
+        set(CITRA_QT_LIBS Qt5::Widgets Qt5::OpenGL)
+    endif()
+
+    if (CITRA_FORCE_QT4 OR NOT Qt5_FOUND)
+        # Try to fallback to Qt4
+        find_package(Qt4 REQUIRED COMPONENTS QtGui QtOpenGL)
+        set(CITRA_QT_LIBS Qt4::QtGui Qt4::QtOpenGL)
    endif()
 endif()

+# This function should be passed a list of all files in a target. It will automatically generate
+# file groups following the directory hierarchy, so that the layout of the files in IDEs matches the
+# one in the filesystem.
+function(create_directory_groups)
+    # Place any files that aren't in the source list in a separate group so that they don't get in
+    # the way.
+    source_group("Other Files" REGULAR_EXPRESSION ".")
+
+    foreach(file_name ${ARGV})
+        get_filename_component(dir_name "${file_name}" PATH)
+        # Group names use '\' as a separator even though the entire rest of CMake uses '/'...
+        string(REPLACE "/" "\\" group_name "${dir_name}")
+        source_group("${group_name}" FILES "${file_name}")
+    endforeach()
+endfunction()
+
 # generate git revision information
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REF_SPEC GIT_REV)
 git_describe(GIT_DESC --always --long --dirty)
 git_branch_name(GIT_BRANCH)
-    
-# internal includes
-include_directories(src)

 # process subdirectories
-if(NOT DISABLE_QT)
+if(ENABLE_QT)
    include_directories(externals/qhexedit)
    add_subdirectory(externals/qhexedit)
 endif()
--- a/citra.sln
+++ b/citra.sln
@ -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
--- a/externals/cmake-modules/FindGLEW.cmake
+++ b/externals/cmake-modules/FindGLEW.cmake
@ -1,47 +0,0 @@
-#
-# Try to find GLEW library and include path.
-# Once done this will define
-#
-# GLEW_FOUND
-# GLEW_INCLUDE_PATH
-# GLEW_LIBRARY
-#
-
-IF (WIN32)
-    FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
-        $ENV{PROGRAMFILES}/GLEW/include
-        ${PROJECT_SOURCE_DIR}/src/nvgl/glew/include
-        DOC "The directory where GL/glew.h resides")
-    FIND_LIBRARY( GLEW_LIBRARY
-        NAMES glew GLEW glew32 glew32s
-        PATHS
-        $ENV{PROGRAMFILES}/GLEW/lib
-        ${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
-        ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
-        DOC "The GLEW library")
-ELSE (WIN32)
-    FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
-        /usr/include
-        /usr/local/include
-        /sw/include
-        /opt/local/include
-        DOC "The directory where GL/glew.h resides")
-    FIND_LIBRARY( GLEW_LIBRARY
-        NAMES GLEW glew
-        PATHS
-        /usr/lib64
-        /usr/lib
-        /usr/local/lib64
-        /usr/local/lib
-        /sw/lib
-        /opt/local/lib
-        DOC "The GLEW library")
-ENDIF (WIN32)
-
-IF (GLEW_INCLUDE_PATH)
-    SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
-ELSE (GLEW_INCLUDE_PATH)
-    SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
-ENDIF (GLEW_INCLUDE_PATH)
-
-MARK_AS_ADVANCED( GLEW_FOUND )
--- a/externals/glew-1.10.0/LICENSE.txt
+++ b/externals/glew-1.10.0/LICENSE.txt
@ -1,73 +0,0 @@
-The OpenGL Extension Wrangler Library
-Copyright (C) 2002-2007, Milan Ikits <milan ikits[]ieee org>
-Copyright (C) 2002-2007, Marcelo E. Magallon <mmagallo[]debian org>
-Copyright (C) 2002, Lev Povalahev
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, 
-  this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, 
-  this list of conditions and the following disclaimer in the documentation 
-  and/or other materials provided with the distribution.
-* The name of the author may be used to endorse or promote products 
-  derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Mesa 3-D graphics library
-Version:  7.0
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Copyright (c) 2007 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
-
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
--- a/externals/glew-1.10.0/README.txt
+++ b/externals/glew-1.10.0/README.txt
@ -1,18 +0,0 @@
-See doc/index.html for more information.
-
-If you downloaded the tarball from the GLEW website, you just need to:
-
-    Unix:
-
-        make
-
-    Windows:
-
-        use the project file in build/vc6/
-
-If you wish to build GLEW from scratch (update the extension data from
-the net or add your own extension information), you need a Unix
-environment (including wget, perl, and GNU make).  The extension data
-is regenerated from the top level source directory with:
-
-        make extensions
--- a/externals/glew-1.10.0/TODO.txt
+++ b/externals/glew-1.10.0/TODO.txt
@ -1,12 +0,0 @@
-Major:
- - add support for windows mini-client drivers
- - add windows installer (msi)
- - separate build of static and shared object files (for mingw and
- cygwin)
- - start designing GLEW 2.0
-
-Minor:
- - make auto scripts work with text mode cygwin mounts
- - add support for all SUN, MTX, and OML extensions
- - make auto/Makefile more robust against auto/core/*~ mistakes
- - web poll on separating glew, glxew and wglew
--- a/externals/glew-1.10.0/bin/Release
+++ b/externals/glew-1.10.0/bin/Release
--- a/externals/glew-1.10.0/bin/Release
+++ b/externals/glew-1.10.0/bin/Release
--- a/externals/glew-1.10.0/bin/Release/Win32/glew32.dll
+++ b/externals/glew-1.10.0/bin/Release/Win32/glew32.dll
--- a/externals/glew-1.10.0/bin/Release/Win32/glewinfo.exe
+++ b/externals/glew-1.10.0/bin/Release/Win32/glewinfo.exe
--- a/externals/glew-1.10.0/bin/Release/Win32/visualinfo.exe
+++ b/externals/glew-1.10.0/bin/Release/Win32/visualinfo.exe
--- a/externals/glew-1.10.0/bin/Release/x64/glew32.dll
+++ b/externals/glew-1.10.0/bin/Release/x64/glew32.dll
--- a/externals/glew-1.10.0/bin/Release/x64/glewinfo.exe
+++ b/externals/glew-1.10.0/bin/Release/x64/glewinfo.exe
--- a/externals/glew-1.10.0/bin/Release/x64/visualinfo.exe
+++ b/externals/glew-1.10.0/bin/Release/x64/visualinfo.exe
--- a/externals/glew-1.10.0/include/GL/glew.h
+++ b/externals/glew-1.10.0/include/GL/glew.h
--- a/externals/glew-1.10.0/include/GL/glxew.h
+++ b/externals/glew-1.10.0/include/GL/glxew.h
--- a/externals/glew-1.10.0/include/GL/wglew.h
+++ b/externals/glew-1.10.0/include/GL/wglew.h
--- a/externals/glew-1.10.0/lib/Release
+++ b/externals/glew-1.10.0/lib/Release
--- a/externals/glew-1.10.0/lib/Release
+++ b/externals/glew-1.10.0/lib/Release
--- a/externals/glew-1.10.0/lib/Release
+++ b/externals/glew-1.10.0/lib/Release
--- a/externals/glew-1.10.0/lib/Release
+++ b/externals/glew-1.10.0/lib/Release
--- a/externals/glew-1.10.0/lib/Release/Win32/glew32.lib
+++ b/externals/glew-1.10.0/lib/Release/Win32/glew32.lib
--- a/externals/glew-1.10.0/lib/Release/Win32/glew32s.lib
+++ b/externals/glew-1.10.0/lib/Release/Win32/glew32s.lib
--- a/externals/glew-1.10.0/lib/Release/x64/glew32.lib
+++ b/externals/glew-1.10.0/lib/Release/x64/glew32.lib
--- a/externals/glew-1.10.0/lib/Release/x64/glew32s.lib
+++ b/externals/glew-1.10.0/lib/Release/x64/glew32s.lib
--- a/externals/glfw-3.0.2/lib-mingw/glfw3.dll
+++ b/externals/glfw-3.0.2/lib-mingw/glfw3.dll
--- a/externals/glfw-3.0.2/lib-msvc100/glfw3.dll
+++ b/externals/glfw-3.0.2/lib-msvc100/glfw3.dll
--- a/externals/glfw-3.0.2/lib-msvc100/glfw3.lib
+++ b/externals/glfw-3.0.2/lib-msvc100/glfw3.lib
--- a/externals/glfw-3.0.2/lib-msvc100/glfw3dll.lib
+++ b/externals/glfw-3.0.2/lib-msvc100/glfw3dll.lib
--- a/externals/glfw-3.0.2/lib-msvc110/glfw3.dll
+++ b/externals/glfw-3.0.2/lib-msvc110/glfw3.dll
--- a/externals/glfw-3.0.2/lib-msvc110/glfw3.lib
+++ b/externals/glfw-3.0.2/lib-msvc110/glfw3.lib
--- a/externals/glfw-3.0.2/lib-msvc110/glfw3dll.lib
+++ b/externals/glfw-3.0.2/lib-msvc110/glfw3dll.lib
--- a/externals/glfw-3.0.4.bin/COPYING.txt
+++ b/externals/glfw-3.0.4.bin/COPYING.txt
--- a/externals/glfw-3.0.4.bin/include/GLFW/glfw3.h
+++ b/externals/glfw-3.0.4.bin/include/GLFW/glfw3.h
@ -133,10 +133,38 @@ extern "C" {

 /* Most GL/glu.h variants on Windows need wchar_t
 * OpenGL/gl.h blocks the definition of ptrdiff_t by glext.h on OS X */
-#include <stddef.h>
+#if !defined(GLFW_INCLUDE_NONE)
+ #include <stddef.h>
+#endif

-
-/* ---------------- GLFW related system specific defines ----------------- */
+/* Include the chosen client API headers.
+ */
+#if defined(__APPLE_CC__)
+  #if defined(GLFW_INCLUDE_GLCOREARB)
+    #include <OpenGL/gl3.h>
+  #elif !defined(GLFW_INCLUDE_NONE)
+    #define GL_GLEXT_LEGACY
+    #include <OpenGL/gl.h>
+  #endif
+  #if defined(GLFW_INCLUDE_GLU)
+    #include <OpenGL/glu.h>
+  #endif
+#else
+  #if defined(GLFW_INCLUDE_GLCOREARB)
+    #include <GL/glcorearb.h>
+  #elif defined(GLFW_INCLUDE_ES1)
+    #include <GLES/gl.h>
+  #elif defined(GLFW_INCLUDE_ES2)
+    #include <GLES2/gl2.h>
+  #elif defined(GLFW_INCLUDE_ES3)
+    #include <GLES3/gl3.h>
+  #elif !defined(GLFW_INCLUDE_NONE)
+    #include <GL/gl.h>
+  #endif
+  #if defined(GLFW_INCLUDE_GLU)
+    #include <GL/glu.h>
+  #endif
+#endif

 #if defined(GLFW_DLL) && defined(_GLFW_BUILD_DLL)
 /* GLFW_DLL is defined by users of GLFW when compiling programs that will link
@ -173,35 +201,6 @@ extern "C" {

 /* -------------------- END SYSTEM/COMPILER SPECIFIC --------------------- */

-/* Include the chosen client API headers.
- */
-#if defined(__APPLE_CC__)
-  #if defined(GLFW_INCLUDE_GLCOREARB)
-    #include <OpenGL/gl3.h>
-  #elif !defined(GLFW_INCLUDE_NONE)
-    #define GL_GLEXT_LEGACY
-    #include <OpenGL/gl.h>
-  #endif
-  #if defined(GLFW_INCLUDE_GLU)
-    #include <OpenGL/glu.h>
-  #endif
-#else
-  #if defined(GLFW_INCLUDE_GLCOREARB)
-    #include <GL/glcorearb.h>
-  #elif defined(GLFW_INCLUDE_ES1)
-    #include <GLES/gl.h>
-  #elif defined(GLFW_INCLUDE_ES2)
-    #include <GLES2/gl2.h>
-  #elif defined(GLFW_INCLUDE_ES3)
-    #include <GLES3/gl3.h>
-  #elif !defined(GLFW_INCLUDE_NONE)
-    #include <GL/gl.h>
-  #endif
-  #if defined(GLFW_INCLUDE_GLU)
-    #include <GL/glu.h>
-  #endif
-#endif
-

 /*************************************************************************
 * GLFW API tokens
@ -228,7 +227,7 @@ extern "C" {
 *  API changes.
 *  @ingroup init
 */
-#define GLFW_VERSION_REVISION       2
+#define GLFW_VERSION_REVISION       4
 /*! @} */

 /*! @name Key and button actions
@ -707,8 +706,8 @@ typedef void (* GLFWmousebuttonfun)(GLFWwindow*,int,int,int);
 *  This is the function signature for cursor position callback functions.
 *
 *  @param[in] window The window that received the event.
- *  @param[in] xpos The new x-coordinate of the cursor.
- *  @param[in] ypos The new y-coordinate of the cursor.
+ *  @param[in] xpos The new x-coordinate, in screen coordinates, of the cursor.
+ *  @param[in] ypos The new y-coordinate, in screen coordinates, of the cursor.
 *
 *  @sa glfwSetCursorPosCallback
 *
@ -766,7 +765,7 @@ typedef void (* GLFWkeyfun)(GLFWwindow*,int,int,int,int);
 *  This is the function signature for Unicode character callback functions.
 *
 *  @param[in] window The window that received the event.
- *  @param[in] character The Unicode code point of the character.
+ *  @param[in] codepoint The Unicode code point of the character.
 *
 *  @sa glfwSetCharCallback
 *
@ -793,7 +792,7 @@ typedef void (* GLFWmonitorfun)(GLFWmonitor*,int);
 *
 *  @ingroup monitor
 */
-typedef struct
+typedef struct GLFWvidmode
 {
    /*! The width, in screen coordinates, of the video mode.
     */
@ -823,7 +822,7 @@ typedef struct
 *
 *  @ingroup monitor
 */
-typedef struct
+typedef struct GLFWgammaramp
 {
    /*! An array of value describing the response of the red channel.
     */
@ -864,10 +863,7 @@ typedef struct
 *
 *  @note This function may only be called from the main thread.
 *
- *  @note This function may take several seconds to complete on some systems,
- *  while on other systems it may take only a fraction of a second to complete.
- *
- *  @note **Mac OS X:** This function will change the current directory of the
+ *  @note **OS X:** This function will change the current directory of the
 *  application to the `Contents/Resources` subdirectory of the application's
 *  bundle, if present.
 *
@ -1233,17 +1229,26 @@ GLFWAPI void glfwWindowHint(int target, int hint);
 *  to not share resources.
 *  @return The handle of the created window, or `NULL` if an error occurred.
 *
+ *  @remarks **Windows:** Window creation will fail if the Microsoft GDI
+ *  software OpenGL implementation is the only one available.
+ *
 *  @remarks **Windows:** If the executable has an icon resource named
 *  `GLFW_ICON,` it will be set as the icon for the window.  If no such icon is
 *  present, the `IDI_WINLOGO` icon will be used instead.
 *
- *  @remarks **Mac OS X:** The GLFW window has no icon, as it is not a document
+ *  @remarks **OS X:** The GLFW window has no icon, as it is not a document
 *  window, but the dock icon will be the same as the application bundle's icon.
 *  Also, the first time a window is opened the menu bar is populated with
 *  common commands like Hide, Quit and About.  The (minimal) about dialog uses
 *  information from the application's bundle.  For more information on bundles,
 *  see the Bundle Programming Guide provided by Apple.
 *
+ *  @remarks **X11:** There is no mechanism for setting the window icon yet.
+ *
+ *  @remarks The swap interval is not set during window creation, but is left at
+ *  the default value for that platform.  For more information, see @ref
+ *  glfwSwapInterval.
+ *
 *  @note This function may only be called from the main thread.
 *
 *  @sa glfwDestroyWindow
@ -1355,10 +1360,6 @@ GLFWAPI void glfwGetWindowPos(GLFWwindow* window, int* xpos, int* ypos);
 *
 *  @note The window manager may put limits on what positions are allowed.
 *
- *  @bug **X11:** Some window managers ignore the set position of hidden (i.e.
- *  unmapped) windows, instead placing them where it thinks is appropriate once
- *  they are shown.
- *
 *  @sa glfwGetWindowPos
 *
 *  @ingroup window
@ -1368,7 +1369,8 @@ GLFWAPI void glfwSetWindowPos(GLFWwindow* window, int xpos, int ypos);
 /*! @brief Retrieves the size of the client area of the specified window.
 *
 *  This function retrieves the size, in screen coordinates, of the client area
- *  of the specified window.
+ *  of the specified window.  If you wish to retrieve the size of the
+ *  framebuffer in pixels, see @ref glfwGetFramebufferSize.
 *
 *  @param[in] window The window whose size to retrieve.
 *  @param[out] width Where to store the width, in screen coordinates, of the
@ -1409,7 +1411,8 @@ GLFWAPI void glfwSetWindowSize(GLFWwindow* window, int width, int height);
 /*! @brief Retrieves the size of the framebuffer of the specified window.
 *
 *  This function retrieves the size, in pixels, of the framebuffer of the
- *  specified window.
+ *  specified window.  If you wish to retrieve the size of the window in screen
+ *  coordinates, see @ref glfwGetWindowSize.
 *
 *  @param[in] window The window whose framebuffer to query.
 *  @param[out] width Where to store the width, in pixels, of the framebuffer,
@ -1592,7 +1595,10 @@ GLFWAPI GLFWwindowsizefun glfwSetWindowSizeCallback(GLFWwindow* window, GLFWwind
 *  @return The previously set callback, or `NULL` if no callback was set or an
 *  error occurred.
 *
- *  @remarks **Mac OS X:** Selecting Quit from the application menu will
+ *  @par New in GLFW 3
+ *  The close callback no longer returns a value.
+ *
+ *  @remarks **OS X:** Selecting Quit from the application menu will
 *  trigger the close callback for all windows.
 *
 *  @ingroup window
@ -1685,6 +1691,12 @@ GLFWAPI GLFWframebuffersizefun glfwSetFramebufferSizeCallback(GLFWwindow* window
 *  This function is no longer called by @ref glfwSwapBuffers.  You need to call
 *  it or @ref glfwWaitEvents yourself.
 *
+ *  @remarks On some platforms, a window move, resize or menu operation will
+ *  cause event processing to block.  This is due to how event processing is
+ *  designed on those platforms.  You can use the
+ *  [window refresh callback](@ref GLFWwindowrefreshfun) to redraw the contents
+ *  of your window when necessary during the operation.
+ *
 *  @note This function may only be called from the main thread.
 *
 *  @note This function may not be called from a callback.
@ -1712,6 +1724,12 @@ GLFWAPI void glfwPollEvents(void);
 *
 *  This function is not required for joystick input to work.
 *
+ *  @remarks On some platforms, a window move, resize or menu operation will
+ *  cause event processing to block.  This is due to how event processing is
+ *  designed on those platforms.  You can use the
+ *  [window refresh callback](@ref GLFWwindowrefreshfun) to redraw the contents
+ *  of your window when necessary during the operation.
+ *
 *  @note This function may only be called from the main thread.
 *
 *  @note This function may not be called from a callback.
@ -1747,9 +1765,12 @@ GLFWAPI int glfwGetInputMode(GLFWwindow* window, int mode);
 *  modes:
 *  - `GLFW_CURSOR_NORMAL` makes the cursor visible and behaving normally.
 *  - `GLFW_CURSOR_HIDDEN` makes the cursor invisible when it is over the client
- *    area of the window.
- *  - `GLFW_CURSOR_DISABLED` disables the cursor and removes any limitations on
- *    cursor movement.
+ *    area of the window but does not restrict the cursor from leaving.  This is
+ *    useful if you wish to render your own cursor or have no visible cursor at
+ *    all.
+ *  - `GLFW_CURSOR_DISABLED` hides and grabs the cursor, providing virtual
+ *    and unlimited cursor movement.  This is useful for implementing for
+ *    example 3D camera controls.
 *
 *  If `mode` is `GLFW_STICKY_KEYS`, the value must be either `GL_TRUE` to
 *  enable sticky keys, or `GL_FALSE` to disable it.  If sticky keys are
@ -1819,7 +1840,8 @@ GLFWAPI int glfwGetMouseButton(GLFWwindow* window, int button);
 /*! @brief Retrieves the last reported cursor position, relative to the client
 *  area of the window.
 *
- *  This function returns the last reported position of the cursor to the
+ *  This function returns the last reported position of the cursor, in screen
+ *  coordinates, relative to the upper-left corner of the client area of the
 *  specified window.
 *
 *  If the cursor is disabled (with `GLFW_CURSOR_DISABLED`) then the cursor
@ -1842,11 +1864,13 @@ GLFWAPI int glfwGetMouseButton(GLFWwindow* window, int button);
 */
 GLFWAPI void glfwGetCursorPos(GLFWwindow* window, double* xpos, double* ypos);

-/*! @brief Sets the position of the cursor, relative to the client area of the window.
+/*! @brief Sets the position of the cursor, relative to the client area of the
+ *  window.
 *
- *  This function sets the position of the cursor.  The specified window must be
- *  focused.  If the window does not have focus when this function is called, it
- *  fails silently.
+ *  This function sets the position, in screen coordinates, of the cursor
+ *  relative to the upper-left corner of the client area of the specified
+ *  window.  The window must be focused.  If the window does not have focus when
+ *  this function is called, it fails silently.
 *
 *  If the cursor is disabled (with `GLFW_CURSOR_DISABLED`) then the cursor
 *  position is unbounded and limited only by the minimum and maximum values of
@ -1854,9 +1878,9 @@ GLFWAPI void glfwGetCursorPos(GLFWwindow* window, double* xpos, double* ypos);
 *
 *  @param[in] window The desired window.
 *  @param[in] xpos The desired x-coordinate, relative to the left edge of the
- *  client area, or `NULL`.
+ *  client area.
 *  @param[in] ypos The desired y-coordinate, relative to the top edge of the
- *  client area, or `NULL`.
+ *  client area.
 *
 *  @sa glfwGetCursorPos
 *
@ -1942,7 +1966,8 @@ GLFWAPI GLFWmousebuttonfun glfwSetMouseButtonCallback(GLFWwindow* window, GLFWmo
 *
 *  This function sets the cursor position callback of the specified window,
 *  which is called when the cursor is moved.  The callback is provided with the
- *  position relative to the upper-left corner of the client area of the window.
+ *  position, in screen coordinates, relative to the upper-left corner of the
+ *  client area of the window.
 *
 *  @param[in] window The window whose callback to set.
 *  @param[in] cbfun The new callback, or `NULL` to remove the currently set
@ -2202,6 +2227,11 @@ GLFWAPI void glfwSwapBuffers(GLFWwindow* window);
 *
 *  @remarks This function may be called from secondary threads.
 *
+ *  @note This function is not called during window creation, leaving the swap
+ *  interval set to whatever is the default on that platform.  This is done
+ *  because some swap interval extensions used by GLFW do not allow the swap
+ *  interval to be reset to zero once it has been set to a non-zero value.
+ *
 *  @note Some GPU drivers do not honor the requested swap interval, either
 *  because of user settings that override the request or due to bugs in the
 *  driver.
--- a/externals/glfw-3.0.4.bin/include/GLFW/glfw3native.h
+++ b/externals/glfw-3.0.4.bin/include/GLFW/glfw3native.h
--- a/externals/glfw-3.0.4.bin/lib-mingw-i686/glfw3.dll
+++ b/externals/glfw-3.0.4.bin/lib-mingw-i686/glfw3.dll
--- a/externals/glfw-3.0.4.bin/lib-mingw-i686/glfw3dll.a
+++ b/externals/glfw-3.0.4.bin/lib-mingw-i686/glfw3dll.a
--- a/externals/glfw-3.0.4.bin/lib-mingw-i686/libglfw3.a
+++ b/externals/glfw-3.0.4.bin/lib-mingw-i686/libglfw3.a
--- a/externals/glfw-3.0.4.bin/lib-mingw-x86_64/glfw3.dll
+++ b/externals/glfw-3.0.4.bin/lib-mingw-x86_64/glfw3.dll
--- a/externals/glfw-3.0.4.bin/lib-mingw-x86_64/glfw3dll.a
+++ b/externals/glfw-3.0.4.bin/lib-mingw-x86_64/glfw3dll.a
--- a/externals/glfw-3.0.4.bin/lib-mingw-x86_64/libglfw3.a
+++ b/externals/glfw-3.0.4.bin/lib-mingw-x86_64/libglfw3.a
--- a/externals/glfw-3.0.4.bin/lib-msvc_v110-Win32/glfw3.dll
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v110-Win32/glfw3.dll
--- a/externals/glfw-3.0.4.bin/lib-msvc_v110-Win32/glfw3.lib
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v110-Win32/glfw3.lib
--- a/externals/glfw-3.0.4.bin/lib-msvc_v110-Win32/glfw3dll.lib
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v110-Win32/glfw3dll.lib
--- a/externals/glfw-3.0.4.bin/lib-msvc_v110-x64/glfw3.dll
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v110-x64/glfw3.dll
--- a/externals/glfw-3.0.4.bin/lib-msvc_v110-x64/glfw3.lib
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v110-x64/glfw3.lib
--- a/externals/glfw-3.0.4.bin/lib-msvc_v110-x64/glfw3dll.lib
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v110-x64/glfw3dll.lib
--- a/externals/glfw-3.0.4.bin/lib-msvc_v120-Win32/glfw3.dll
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v120-Win32/glfw3.dll
--- a/externals/glfw-3.0.4.bin/lib-msvc_v120-Win32/glfw3.lib
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v120-Win32/glfw3.lib
--- a/externals/glfw-3.0.4.bin/lib-msvc_v120-Win32/glfw3dll.lib
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v120-Win32/glfw3dll.lib
--- a/externals/glfw-3.0.4.bin/lib-msvc_v120-x64/glfw3.dll
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v120-x64/glfw3.dll
--- a/externals/glfw-3.0.4.bin/lib-msvc_v120-x64/glfw3.lib
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v120-x64/glfw3.lib
--- a/externals/glfw-3.0.4.bin/lib-msvc_v120-x64/glfw3dll.lib
+++ b/externals/glfw-3.0.4.bin/lib-msvc_v120-x64/glfw3dll.lib
--- a/externals/qhexedit/CMakeLists.txt
+++ b/externals/qhexedit/CMakeLists.txt
@ -5,14 +5,17 @@ set(SRCS
            commands.cpp
            qhexedit.cpp
            qhexedit_p.cpp
-            xbytearray.cpp)
+            xbytearray.cpp
+            )

 set(HEADERS
+            commands.h
            qhexedit.h
-            qhexedit_p.h)
+            qhexedit_p.h
+            xbytearray.h
+            )
+
+create_directory_groups(${SRCS} ${HEADERS})

 add_library(qhexedit STATIC ${SRCS} ${HEADERS})
-if(USE_QT5)
-    target_link_libraries(qhexedit Qt5::Core Qt5::Widgets)
-endif()
-
+target_link_libraries(qhexedit ${CITRA_QT_LIBS})
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -1,9 +1,12 @@
+# Enable modules to include each other's files
+include_directories(.)
+
 add_subdirectory(common)
 add_subdirectory(core)
 add_subdirectory(video_core)
-add_subdirectory(citra)
-add_subdirectory(citra_qt)
-
-if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)
-    #add_subdirectory(citra_qt)
+if (ENABLE_GLFW)
+    add_subdirectory(citra)
+endif()
+if (ENABLE_QT)
+    add_subdirectory(citra_qt)
 endif()
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@ -1,6 +1,13 @@
-set(SRCS    citra.cpp
-            emu_window/emu_window_glfw.cpp)
-set(HEADERS resource.h)
+set(SRCS
+            emu_window/emu_window_glfw.cpp
+            citra.cpp
+            )
+set(HEADERS
+            emu_window/emu_window_glfw.h
+            resource.h
+            )
+
+create_directory_groups(${SRCS} ${HEADERS})

 # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
 if (NOT X11_xf86vmode_LIB)
@ -8,11 +15,16 @@ if (NOT X11_xf86vmode_LIB)
 endif()

 add_executable(citra ${SRCS} ${HEADERS})
+target_link_libraries(citra core common video_core)
+target_link_libraries(citra ${OPENGL_gl_LIBRARY} ${GLFW_LIBRARIES})

 if (APPLE)
-    target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES})
-else()
-    target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi Xcursor ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB} ${PNG_LIBRARIES})
+    target_link_libraries(citra iconv pthread ${COREFOUNDATION_LIBRARY})
+elseif (WIN32)
+    target_link_libraries(citra winmm)
+else() # Unix
+    target_link_libraries(citra pthread rt)
+    target_link_libraries(citra ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_Xcursor_LIB} ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB})
 endif()

 #install(TARGETS citra RUNTIME DESTINATION ${bindir})
--- a/src/citra/citra.vcxproj
+++ b/src/citra/citra.vcxproj
@ -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>
--- a/src/citra/citra.vcxproj.filters
+++ b/src/citra/citra.vcxproj.filters
@ -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>
--- a/src/citra/emu_window/emu_window_glfw.h
+++ b/src/citra/emu_window/emu_window_glfw.h
@ -4,7 +4,6 @@

 #pragma once

-#include <GL/glew.h>
 #include <GLFW/glfw3.h>

 #include "common/emu_window.h"
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@ -2,54 +2,61 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

 set(SRCS
-            bootmanager.cpp
+            config/controller_config.cpp
+            config/controller_config_util.cpp
            debugger/callstack.cpp
            debugger/disassembler.cpp
            debugger/graphics.cpp
            debugger/graphics_cmdlists.cpp
            debugger/ramview.cpp
            debugger/registers.cpp
+            bootmanager.cpp
            hotkeys.cpp
            main.cpp
-            config/controller_config.cpp
-            config/controller_config_util.cpp)
+            )

 set(HEADERS
-            bootmanager.hxx
+            config/controller_config.hxx
+            config/controller_config_util.hxx
            debugger/callstack.hxx
            debugger/disassembler.hxx
+            debugger/graphics.hxx
+            debugger/graphics_cmdlists.hxx
            debugger/ramview.hxx
            debugger/registers.hxx
+            bootmanager.hxx
            hotkeys.hxx
            main.hxx
            version.h
-            config/controller_config.hxx
-            config/controller_config_util.hxx)
+            )

 set(UIS
+            config/controller_config.ui
            debugger/callstack.ui
            debugger/disassembler.ui
            debugger/registers.ui
            hotkeys.ui
            main.ui
-            config/controller_config.ui)
+            )

-if(USE_QT5)
+create_directory_groups(${SRCS} ${HEADERS} ${UIS})
+
+if (Qt5_FOUND)
    qt5_wrap_ui(UI_HDRS ${UIS})
 else()
    qt4_wrap_ui(UI_HDRS ${UIS})
 endif()

 add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})
-if(APPLE)
-	set(ICONV_LIBRARY iconv)
-else()
-	set(RT_LIBRARY rt)
-endif()
+target_link_libraries(citra-qt core common video_core qhexedit)
+target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS})

-target_link_libraries(citra-qt core common video_core qhexedit ${ICONV_LIBRARY} ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${RT_LIBRARY} ${GLEW_LIBRARY} ${PNG_LIBRARIES})
-if(USE_QT5)
-    target_link_libraries(citra-qt Qt5::Gui Qt5::Widgets Qt5::OpenGL)
+if (APPLE)
+    target_link_libraries(citra-qt iconv ${COREFOUNDATION_LIBRARY})
+elseif (WIN32)
+    target_link_libraries(citra-qt winmm)
+else() # Unix
+    target_link_libraries(citra-qt rt)
 endif()

 #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir})
--- a/src/citra_qt/citra_qt.vcxproj
+++ b/src/citra_qt/citra_qt.vcxproj
@ -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>
--- a/src/citra_qt/citra_qt.vcxproj.filters
+++ b/src/citra_qt/citra_qt.vcxproj.filters
@ -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>
--- a/src/citra_qt/qt-build.props
+++ b/src/citra_qt/qt-build.props
@ -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>
--- a/src/citra_qt/qt-build.targets
+++ b/src/citra_qt/qt-build.targets
@ -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>
--- a/src/citra_qt/qt-build.xml
+++ b/src/citra_qt/qt-build.xml
@ -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>
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@ -1,6 +1,8 @@
+# Generate cpp with Git revision from template
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp" @ONLY)

-set(SRCS    break_points.cpp
+set(SRCS
+            break_points.cpp
            console_listener.cpp
            extended_trace.cpp
            file_search.cpp
@ -12,23 +14,25 @@ set(SRCS    break_points.cpp
            memory_util.cpp
            misc.cpp
            msg_handler.cpp
-            string_util.cpp
            scm_rev.cpp
+            string_util.cpp
            symbols.cpp
            thread.cpp
            timer.cpp
-            utf8.cpp)
+            utf8.cpp
+            )

-set(HEADERS atomic.h
+set(HEADERS
+            atomic.h
            atomic_gcc.h
            atomic_win32.h
            bit_field.h
            break_points.h
            chunk_file.h
+            common.h
            common_funcs.h
            common_paths.h
            common_types.h
-            common.h
            console_listener.h
            cpu_detect.h
            debug_interface.h
@ -37,10 +41,11 @@ set(HEADERS atomic.h
            fifo_queue.h
            file_search.h
            file_util.h
+            fixed_size_queue.h
            hash.h
            linear_disk_cache.h
-            log_manager.h
            log.h
+            log_manager.h
            math_util.h
            mem_arena.h
            memory_util.h
@ -54,8 +59,12 @@ set(HEADERS atomic.h
            swap.h
            symbols.h
            thread.h
+            thread_queue_list.h
            thunk.h
            timer.h
-            utf8.h)
+            utf8.h
+            )
+
+create_directory_groups(${SRCS} ${HEADERS})

 add_library(common STATIC ${SRCS} ${HEADERS})
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@ -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>
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@ -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>
--- a/src/common/log.h
+++ b/src/common/log.h
@ -4,7 +4,9 @@

 #pragma once

+#ifndef LOGGING
 #define LOGGING
+#endif

 enum {
    OS_LEVEL,       // Printed by the emulated operating system
--- a/src/common/scm_rev_gen.js
+++ b/src/common/scm_rev_gen.js
@ -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);
-}
--- a/src/common/scm_rev_gen.vcxproj
+++ b/src/common/scm_rev_gen.vcxproj
@ -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>
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -1,14 +1,18 @@
-set(SRCS    core.cpp
-            core_timing.cpp
-            loader/elf.cpp
-            loader/loader.cpp
-            loader/ncch.cpp
-            mem_map.cpp
-            mem_map_funcs.cpp
-            system.cpp
+set(SRCS
            arm/disassembler/arm_disasm.cpp
            arm/disassembler/load_symbol_map.cpp
-            file_sys/archive_romfs.cpp
+            arm/interpreter/mmu/arm1176jzf_s_mmu.cpp
+            arm/interpreter/mmu/cache.cpp
+            arm/interpreter/mmu/maverick.cpp
+            arm/interpreter/mmu/rb.cpp
+            arm/interpreter/mmu/sa_mmu.cpp
+            arm/interpreter/mmu/tlb.cpp
+            arm/interpreter/mmu/wb.cpp
+            arm/interpreter/mmu/xscale_copro.cpp
+            arm/interpreter/vfp/vfp.cpp
+            arm/interpreter/vfp/vfpdouble.cpp
+            arm/interpreter/vfp/vfpinstr.cpp
+            arm/interpreter/vfp/vfpsingle.cpp
            arm/interpreter/arm_interpreter.cpp
            arm/interpreter/armcopro.cpp
            arm/interpreter/armemu.cpp
@ -18,22 +22,7 @@ set(SRCS    core.cpp
            arm/interpreter/armsupp.cpp
            arm/interpreter/armvirt.cpp
            arm/interpreter/thumbemu.cpp
-            arm/interpreter/vfp/vfp.cpp
-            arm/interpreter/vfp/vfpdouble.cpp
-            arm/interpreter/vfp/vfpinstr.cpp
-            arm/interpreter/vfp/vfpsingle.cpp
-            arm/interpreter/mmu/arm1176jzf_s_mmu.cpp
-            arm/interpreter/mmu/cache.cpp
-            arm/interpreter/mmu/maverick.cpp
-            arm/interpreter/mmu/rb.cpp
-            arm/interpreter/mmu/sa_mmu.cpp
-            arm/interpreter/mmu/tlb.cpp
-            arm/interpreter/mmu/wb.cpp
-            arm/interpreter/mmu/xscale_copro.cpp
-            hle/hle.cpp
-            hle/config_mem.cpp
-            hle/coprocessor.cpp
-            hle/svc.cpp
+            file_sys/archive_romfs.cpp
            hle/kernel/address_arbiter.cpp
            hle/kernel/archive.cpp
            hle/kernel/event.cpp
@ -48,27 +37,26 @@ set(SRCS    core.cpp
            hle/service/ndm.cpp
            hle/service/service.cpp
            hle/service/srv.cpp
+            hle/config_mem.cpp
+            hle/coprocessor.cpp
+            hle/hle.cpp
+            hle/svc.cpp
            hw/gpu.cpp
            hw/hw.cpp
-            hw/ndma.cpp)
+            hw/ndma.cpp
+            loader/elf.cpp
+            loader/loader.cpp
+            loader/ncch.cpp
+            core.cpp
+            core_timing.cpp
+            mem_map.cpp
+            mem_map_funcs.cpp
+            system.cpp
+            )

-set(HEADERS core.h
-            core_timing.h
-            loader/elf.h
-            loader/loader.h
-            loader/ncch.h
-            mem_map.h
-            system.h
+set(HEADERS
            arm/disassembler/arm_disasm.h
            arm/disassembler/load_symbol_map.h
-            arm/interpreter/arm_interpreter.h
-            arm/interpreter/arm_regformat.h
-            arm/interpreter/armcpu.h
-            arm/interpreter/armdefs.h
-            arm/interpreter/armemu.h
-            arm/interpreter/armmmu.h
-            arm/interpreter/armos.h
-            arm/interpreter/skyeye_defs.h
            arm/interpreter/mmu/arm1176jzf_s_mmu.h
            arm/interpreter/mmu/cache.h
            arm/interpreter/mmu/rb.h
@ -78,27 +66,48 @@ set(HEADERS core.h
            arm/interpreter/vfp/asm_vfp.h
            arm/interpreter/vfp/vfp.h
            arm/interpreter/vfp/vfp_helper.h
+            arm/interpreter/arm_interpreter.h
+            arm/interpreter/arm_regformat.h
+            arm/interpreter/armcpu.h
+            arm/interpreter/armdefs.h
+            arm/interpreter/armemu.h
+            arm/interpreter/armmmu.h
+            arm/interpreter/armos.h
+            arm/interpreter/skyeye_defs.h
+            arm/arm_interface.h
            file_sys/archive.h
            file_sys/archive_romfs.h
-            hle/config_mem.h
-            hle/coprocessor.h
-            hle/hle.h
-            hle/svc.h
            hle/kernel/address_arbiter.h
            hle/kernel/archive.h
+            hle/kernel/event.h
            hle/kernel/kernel.h
            hle/kernel/mutex.h
            hle/kernel/shared_memory.h
            hle/kernel/thread.h
-            hle/function_wrappers.h
            hle/service/apt.h
            hle/service/fs.h
            hle/service/gsp.h
            hle/service/hid.h
+            hle/service/ndm.h
            hle/service/service.h
            hle/service/srv.h
+            hle/config_mem.h
+            hle/coprocessor.h
+            hle/function_wrappers.h
+            hle/hle.h
+            hle/svc.h
            hw/gpu.h
            hw/hw.h
-            hw/ndma.h)
+            hw/ndma.h
+            loader/elf.h
+            loader/loader.h
+            loader/ncch.h
+            core.h
+            core_timing.h
+            mem_map.h
+            system.h
+            )
+
+create_directory_groups(${SRCS} ${HEADERS})

 add_library(core STATIC ${SRCS} ${HEADERS})
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@ -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>
--- a/src/core/core.vcxproj.filters
+++ b/src/core/core.vcxproj.filters
@ -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>
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@ -1,27 +1,42 @@
-set(SRCS    clipper.cpp
+set(SRCS
+            renderer_opengl/generated/gl_3_2_core.c
+            renderer_opengl/renderer_opengl.cpp
+            renderer_opengl/gl_shader_util.cpp
+            debug_utils/debug_utils.cpp
+            clipper.cpp
            command_processor.cpp
            primitive_assembly.cpp
            rasterizer.cpp
            utils.cpp
            vertex_shader.cpp
            video_core.cpp
-            renderer_opengl/renderer_opengl.cpp
-            renderer_opengl/gl_shader_util.cpp
-            debug_utils/debug_utils.cpp)
+            )

-set(HEADERS clipper.h
-            command_processor.h
-            math.h
-            primitive_assembly.h
-            rasterizer.h
-            utils.h
-            video_core.h
-            renderer_base.h
-            vertex_shader.h
-            video_core.h
-            renderer_opengl/renderer_opengl.h
+set(HEADERS
+            debug_utils/debug_utils.h
+            renderer_opengl/generated/gl_3_2_core.h
            renderer_opengl/gl_shader_util.h
            renderer_opengl/gl_shaders.h
-            debug_utils/debug_utils.h)
+            renderer_opengl/renderer_opengl.h
+            clipper.h
+            command_processor.h
+            gpu_debugger.h
+            math.h
+            pica.h
+            primitive_assembly.h
+            rasterizer.h
+            renderer_base.h
+            utils.h
+            vertex_shader.h
+            video_core.h
+            )
+
+create_directory_groups(${SRCS} ${HEADERS})

 add_library(video_core STATIC ${SRCS} ${HEADERS})
+
+if (PNG_FOUND)
+    target_link_libraries(video_core ${PNG_LIBRARIES})
+    include_directories(${PNG_INCLUDE_DIRS})
+    add_definitions(${PNG_DEFINITIONS})
+endif()
--- a/src/video_core/renderer_opengl/generated/Readme.md
+++ b/src/video_core/renderer_opengl/generated/Readme.md
@ -0,0 +1,5 @@
+These file were generated by the [glLoadGen](https://bitbucket.org/alfonse/glloadgen/wiki/Home) OpenGL loader generator and have been checked in as-is. You can re-generate them using version 2.0.2 of glLoadGen and executing the following command:
+
+```
+lua LoadGen.lua -version 3.2 -profile core -indent space 3_2_core
+```
--- a/src/video_core/renderer_opengl/generated/gl_3_2_core.c
+++ b/src/video_core/renderer_opengl/generated/gl_3_2_core.c
--- a/src/video_core/renderer_opengl/generated/gl_3_2_core.h
+++ b/src/video_core/renderer_opengl/generated/gl_3_2_core.h
--- a/src/video_core/renderer_opengl/gl_shader_util.h
+++ b/src/video_core/renderer_opengl/gl_shader_util.h
@ -4,7 +4,7 @@

 #pragma once

-#include <GL/glew.h>
+#include "generated/gl_3_2_core.h"

 namespace ShaderUtil {

--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@ -247,10 +247,9 @@ void RendererOpenGL::SetWindow(EmuWindow* window) {
 void RendererOpenGL::Init() {
    render_window->MakeCurrent();

-    GLenum err = glewInit();
-    if (GLEW_OK != err) {
-        ERROR_LOG(RENDER, "Failed to initialize GLEW! Error message: \"%s\". Exiting...",
-                  glewGetErrorString(err));
+    int err = ogl_LoadFunctions();
+    if (ogl_LOAD_SUCCEEDED != err) {
+        ERROR_LOG(RENDER, "Failed to initialize GL functions! Exiting...");
        exit(-1);
    }

@ -265,7 +264,6 @@ void RendererOpenGL::Init() {

    // Initialize everything else
    // --------------------------
-
    InitFramebuffer();

    NOTICE_LOG(RENDER, "GL_VERSION: %s\n", glGetString(GL_VERSION));
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@ -4,7 +4,7 @@

 #pragma once

-#include <GL/glew.h>
+#include "generated/gl_3_2_core.h"

 #include "common/common.h"
 #include "common/emu_window.h"
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@ -30,11 +30,6 @@ void Start() {

 /// Initialize the video core
 void Init(EmuWindow* emu_window) {
-
-    // Required in order for GLFW to work on Linux, 
-    // or for GL contexts above 2.x on OS X
-    glewExperimental = GL_TRUE;
-
    g_emu_window = emu_window;
    g_renderer = new RendererOpenGL();
    g_renderer->SetWindow(g_emu_window);
--- a/src/video_core/video_core.vcxproj
+++ b/src/video_core/video_core.vcxproj
@ -1,149 +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\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="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>
--- a/src/video_core/video_core.vcxproj.filters
+++ b/src/video_core/video_core.vcxproj.filters
@ -1,57 +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>
-  </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>
-  </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>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-</Project>
--- a/vsprops/app.props
+++ b/vsprops/app.props
@ -1,27 +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)glew-1.10.0\bin\Release\$(PlatformName)\glew32.dll" "$(EmuBinDir)" /Y /S /D
-xcopy "$(ExternalsDir)glfw-3.0.2\lib-msvc100\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>
--- a/vsprops/base.props
+++ b/vsprops/base.props
@ -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>
--- a/vsprops/code_generation_debug.props
+++ b/vsprops/code_generation_debug.props
@ -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>
--- a/vsprops/code_generation_release.props
+++ b/vsprops/code_generation_release.props
@ -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>
--- a/vsprops/externals.props
+++ b/vsprops/externals.props
@ -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)glew-1.10.0\include;$(ExternalsDir)glfw-3.0.2\include;$(ExternalsDir)qhexedit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>
-      </PreprocessorDefinitions>
-    </ClCompile>
-    <Lib />
-    <Link>
-      <AdditionalLibraryDirectories>$(ExternalsDir)glew-1.10.0\lib\Release\$(PlatformName);$(ExternalsDir)glfw-3.0.2\lib-msvc100;$(ExternalsDir)libjpeg;$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>glfw3dll.lib;opengl32.lib;glew32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-    </Link>
-    <ProjectReference />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="ExternalsDir">
-      <Value>$(ExternalsDir)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
--- a/vsprops/optimization_debug.props
+++ b/vsprops/optimization_debug.props
@ -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>
--- a/vsprops/optimization_release.props
+++ b/vsprops/optimization_release.props
@ -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>
--- a/vsprops/qt.props
+++ b/vsprops/qt.props
@ -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)glew-1.6.0\include" /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>
--- a/vsprops/qt_libs_debug.props
+++ b/vsprops/qt_libs_debug.props
@ -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)glew-1.6.0\include" /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>
--- a/vsprops/qt_libs_release.props
+++ b/vsprops/qt_libs_release.props
@ -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>